Adds Query wrappers and Main class stuff.