Adding MainStrategy
Merge branch 'firststrategy'