Added two separate modes. Also modified various things are per
instructions from review.
Merge pull request #3 from azlyth/master

Added two separate modes. Also modified various things are per