Refactored, trying something out with the naming of classes