Did some more work on the objects