More work on domain
More domain updates
Datamanager compiles