Further work on objects

Selection is a WIP