Complete overhaul of API query methods.  Will begin implementation
shortly