Mike commit

-merged Strategy

-partially working, only need to fix the end return