Lots of stuff, forgot to commit :(