Refactor some handlers
Finish up the session refactor (#2)