More work in progress.

Signed-off-by: Daira Hopwood <david-sarah@jacaranda.org>