Ooops

Been a bit busy for a while, probably should get back to this again. Mapping gone a bit awry due to personal circs, but will get there eventually.