Mid work commit, working on bus compiling