Add buying/selling mechanism
Merge origin/master