First commit putting everything in bootstrap-generate map