Finished coding and testing on strategy classes