intermediate commit on nov 28
Incomplete ckp #25