First stab at adding back in the sessions, tests are failing lol