Working on integrating the strategies again