refactored models, added schedule display