Modularize and add join, help, and query functionality.