some more progress... slow...