Sure thing.  We are thinking of refactoring this as the code is not that easy to understand.  But comments first. :)

On a wider note, I wonder if we should just use this branch/PR to merge in the actual submission.   If we resubmit then you guys have to look at the code all over again.