@BigRoy are you happy if we merge in your work from avalon in this repo? i'm happy to do some legwork https://github.com/getavalon/core/issues/496