More progress. Just committing as a backup.