WIP: Reasonably major refactor
Merge pull request #38 from ericdill/input_defaults

WIP: Reasonably major refactor