Wip

Head of this has some fixes on that may be of interest.
That's a typo. I'll fix it up.