Basic strategy implemenmted
Merge origin/master