Cleaning up.  Code close to structure I want now.