added bubbz, some other stuff that might get ditched.