Added some explanatory comments and TODOs
Factored Labels into a single Datatype
Merge pull request #1 from squera/master

Pulling into 1 branch