Merge pull request #44 from rphitt1/master

template stuff that still needs to be fixed