WIP rewriting class management

Still have to handle constructor properly