Whoops

Should wait to push changes till I wake up lol, that was stupid. Will
read more when I'm fully awake, this is just to make it all work again
:p