Added new beginning of strategy pattern
Second pass strategy pattern