More changes, keep working on Sessions
Ahhh! Sessions are frustrating :(