Incorporate IP based static session logic from Matt.