Added more classes for best organization, but need more work