Splitting out Buy/Sell functionality
Merge branch 'master'