Implemented SimpleObject, need to do some cleanup