Some progress on #20