Getting closer, but no cigar

I'll rebase this commit out of the history later on.