There. I think this is enough progress until @theoneeyedowl sees it...