[ more ] Finishing the work.

It looks like it's working on the input set I have so far. Great!