reverting last 3 commits.  didn't really work.