added all query options. code is now finished. time to check all
requirements have been met.