All tests working, moving on to Code Refactoring