Qbuster

Merging now to avoid issues later. May branch off again depending on how much more the DB changes.