1.8.0 Progress

Done a lot of the heavy work, still got a lot to do!
Most of it is just falling together nicely!