Bunch of things. Haven't commited in a bit