source-rework: more WIP