Dummy merge, going to manually change stuff now
Ported over occaNight