Code Review PR

Consider grabbing this from a route parameter to reduce the dependency on session.