Catching up to Hackage 1/2

I kinda forgot this was on github...