WIP: Commits from overnight work
Merge pull request #2 from ericdill/overnight_work

WIP: Commits from overnight work