Check in work on core modeling code.
Add query module.