Add Statregy Pattern - WIP