Substantial re-write of populated_db_with_stubdata.py
More work on objectquery models