I haven't answered yet because I'm still thinking through the issue. You may not be aware of it, but ideas have been tossed around for how to improve HBD mechanics for many years now. Making a decision about making changes to the mechanism is a non-trivial one, and I'm not going to commit to working on code related to that until/if I have a solid plan for doing it.
RE: Leo and Hive. Two paths, one way.