Modified ObjectManager and moved States

Objects are now directly added and removed and can be bulk created.