Couple more classes

Added a few more classes that are needed for the project