Commit before bootstrap
lots of stuff