Totally got session working, guys!!!

Also, sorry for pushing to master this morning. It was early, and I was drunk on power. You can spank me later.