Refactor; remove concept of strategies, for now
Fix merge conflicts