- Support query and printing
- Refactor code to be more modular
- New command line arguments figure out expected file formats by name