Closes #58, some classes can't still deleted before work on #59