fix conflict
bus integration -- somewhat working.