Updated with the bootstrap, new tests, and logging.