Got rid of static methods, use strategies