new user stuff - big changes