Bootstrapify

Some more bootstrapification.