more work in progress toward 2.0 version