More WIP.

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