More progress. *Commented out