APR WIP

I'm working on a pile of things at once. Not all of it mine.

But here's a peek at one of them...