Completed all the initial unit tests and acceptances with refactoring.