More progress towards builder