Nat's work from the morning 3/1
Merge pull request #1 from natwebb/master

Nat's work from the morning 3/1