Progress

Nearly finished! Unfortunately the last bit is a bit tricky and might require a few false starts - but at least it is fully usable now!