changes since initial turn in
more progress