i will do this... eventually

sorry folks for not getting this done before Whitsun started, life got in the way. I hope to have it rewritten by the end at least, but don't hold your breath.