A few steps toward what I had it looking like a few years ago

My git got all crazy because I originally edited the bootstrap file, so I had to go back and do some janky git stuff. Sorry if this comes across weird.