Lots of updates b/c I am lazy with git