implemented the rest of the input options.
Merge branch 'master' of https://github.com/joethered/asg3