! Need to set the right session var for the check to work
! General cleanup