Make the session timeout configurable
DO NOT MERGE: Debugging