QueryBuilder is mostly complete and functionally working. Started process of converting database actions to use the interfaces. A design decision on where and how to use the interfaces now presents itself.