WIP
Merge pull request #1 from kdank/jacob_branch

WIP