archi changes to allow wiring up of bus instead of being a global, touches to lombok tags