Progress commit

Changes for discussion with Peter B