Changing some stuff and breaking other things, hopefully fixing most stuff