Work towards handling all planes in subtites, generalizing for CVD, and