There seems to be duplication here with the busser. Should this be extracted into a module?