Ongoing bootstrapification. Got to shit a bit ...
as per last commit