Reworked sessions so they work