more progress. almost there.