bit of work on #21