separated out the queries into different files, properly dispatch all calls