Sounds like the next logical step...after this PR maybe?