First commit, basics are working and the bootstrap model is working