would this be better placed in corehq / init?