more progress, almost there