Rework #10: almost there