merge new moderator stuff, new app routes.js