Refactor so we dont interact directly with session from controller and view.