Continue with sessions.. should be about done except for UI changes

and testing :O lol