testing new templates

addresses #2 - may still have bugs.