Start of rework of routes for CSRF and logging