Wip 9173

Done (got rid of if and just asserted that session is on a list)