bootstrap

This change is a follow up to the bootstrap discussion.