Merge pull request #36 from jpkeane/calliope

Calliope
Code tidy
Fixed missing label
Updated for best practices
Merge branch 'calliope' into staging
Merge branch 'staging'