Final code added to group project