Updated to use strategies

Like it says in the title