Issue 5

Merging latest updates to Issue #5 with master branch. Development is still underway for Stripe integration, but initial integration is being merged.