broken commit:
- added query infrastructure
- started adding some functionality to Web application
- added additional spec file