reworking object map
object map fixed. Fixing failing tests.