Fix the stuff that decides not to work...
Add basic session handling