Add bootstrap and other Phase II stuff