Implemented everything. Time to fix output problems.
Merge pull request #3 from nkibler7/master

Implemented everything. Time to fix output problems.