Moving a couple more things into the SESSION.