commit up

Finished cleaning up everything that is not private in Unit
Commit up again.