Finish Datamanager, CourierA and Alice, need testing