wip on replacing session with account