Finished, minus class refactoring