@pitr-ch, I'm glad you mentioned it. :)  I was actually thinking the same thing on the drive to the office this morning, but I had already "pushed" the PR button.   I've created commit 5b14f0e to refactor some of the logic to the model.