wip: requirement expander