Finished the Einheit managment