Updated the templating a bit, not going to touch this stuff until a final overhaul.