Next stage of work on #164