Initial working version.
Weird, this should have come in before.