Still refactoring
Working on session variables