WIP on migrating to the class