Added Solution class and filled out some classes I forget