wip: more progress