add InstancePrefix all over the place
comment out everything but the roll query