more progress...still lots to do...