stuff currently broken
stuff
fixed query bug