lots of template edits, yikes