Getting expand/contract working.  Not done.  Kludgy at the moment.