Addressed #21, attached interdiff with #16.
#22, introduced a new solution, ...