Refactored classes to prep merge with master
Refactored classes to prep merge with master