rework to use generators for strategies
forgot a file