Progress commit on redesign, no coverage yet
Updating code coverage, fixing minor bugs
Merge pull request #3 from mdurrant/feature/redesign

Feature/redesign