WIP changes to work with an object