Work in progress on handling user state