User Story 2 & 3

User Story 2 & 3 complete, need refactoring.