More functionality.
Merge branch 'master' of https://github.com/CraigSnowden/team-super-awesome.git