further wip; [skip ci]