Changing course and direction of entire project, doing Classes instead of enums