I'm working on improving this in another branch (not yet PR)..