Object oriented WIP