WIP: simplify