Preparing for this to be used as a submodule in various cbh apps