@konklone and @mrumsey's work from today.
Merge pull request #7 from sbma44/matt-eric

@konklone and @mrumsey's work from today