Moved strategy methods around to make them a little easier to follow.