WIP changes to all classes