Cleaning up. Added EQuery.