add support for objects, step two