More work on labels; they are still WIP though
Fleshing out labels (they mostly work aside from a few validation issues/other minor bugs
Derp. commit -a didn't add the label files.