complete overhaul with template
Merge pull request #2 from CodyDunlap/master

complete overhaul with template