Merge pull request #6 from ssniteman/Todd

form insert
mess up
fixing Todd
working on template