Incomplete, but provides the basic interface
Merge branch 'master' of https://github.com/bradjohns94/Team-Software-Project