A couple changes, currently can be run in dev without constantly crashing lol