Bootstrap branch
Crudely hack in some dependency options
tmp