Updated Queries, removed ifExists, tested and ready to go

Finished up the queries 

@cjwhite