latest round of changes - much more simplified API addressing USERGRID-1753