Added some meat inside of the object classes