working on replacing user and client with session in handlers