Changing the way that sessions work - not stable yet