Bus demo now works (for the most part)!