getting close
lots of edits; almost done
lots of changes