Working on adding session handling