More rewrites....  HOPEFULLY done.