Added a bunch bootstrap stuff