Attempted to reorganize classes. Not ideal