(TOM) Add first strategy pattern, need to fix errors