Commit before majot change
Made it work for single objects
Made it work for single objects
some more clean up and bug fixes