I agree, but I think merging these systems belongs in its own pull request since it may not be super trivial

I've created a tracking issue:
https://github.com/azavea/OTM2/issues/1001