Created some classes for later expansions