Found some more bits.
More work for #7. Not yet finished.