Bug #19

Remove bus singleton and pass it as an argument.