Moved stuff around added unit manager

Stuff needs to be though out more. This build will not run