Small changes to templates and routes. Still planning
Added in missed new files