Final Commit

Final commit of Group 3's work