First draft converting to eco.
Convert to eco and cleanup.