Lots of updates because I forgot to branch