everything but query function works. going to push to server