Issues/3

For #3 

Plan is to treat this fork as patches on top of the upstream. Rather than incorporating into our current master branch, we will instead just reset master to be this branch, which is commits on top of upstream.