Added routes

Added routes and views. May undo this if performance is to slow
Merge remote-tracking branch 'origin/development' into gh-pages