WIP: more progress on data structure post