Added a few classes and merged with Samuel's project
Added a few classes and merged with Samuel's project 2
test