Refactored code
Deleted file - no longer required
Sprint 1, partially implemented.