Making slow but steady progress towards #14