WIP on class manipulation