working on sessions
merge conflict, chronometer listener taken