Starter, mostly stub code for issue #207.