progress
Merge branch 'master' of https://github.com/andreaowu/SupplyAndApply
commented out the parts that aren't working