Still working on the adapters.

This is making very slow progress.