Attempt at replacing timeframe logic in controller with session logic.