Group Project Refactored

User stories and line 28 refactored.