Adding final code for group project