Lots more WIP hacking. Crashes during loading.