some more changes.  almost got this!