More work on #17