Basic user, bootstrap, and lots of other stuff
Fix conflicts and merge