WIP: more progress, need to write test now