Added charts, finished models, fixed routing