More bootstrap, refs #6.