still fixing user stuff