Merge pull request #66 from jloehman/lindsey

Lindsey
contact blade missing info
refactor of contact
Merge pull request #68 from jloehman/jason

Jason
Merge conflicts resolved