merging nick's repo into mine