Merge pull request #1 from oliverlockwood/initial-phase

Initial phase of development