Add initial re-write of roof