massive changes to add a 'zipper' representation of C--