Improved user API... still not working though, WIP.