New stages

I think I've got the new stages working with the head of master.