I should probably nto code when I am sick

Made the object system simpler (I think)