added basic inputs
Merge pull request #1 from erikolsen/Erik

added basic inputs