Making some slow progress.

Hopefully I don't end up wasting time tinkering with "unnecessary" features...