Fixing indentation, adding pragma marks and integrating Hockey App #20

Mostly working on #20.