Merged back into master and I messed up some things that I needed to refix :p