Upgrade thunk + improve user management

INCOMPLETE