Work in progress branch of ucw-core