More bootstrap, closes #6.