Still working, now starting to compile some classes to avoid have to fix all later