Merge pull request #38 from JohnathanWeisner/PuttingItAllTogether

Putting it all together
Many changes and bug fixes. A lot of functionality and issues were resolved.