Couldn't sleep so reformatted the templates to be ordinary strings rather than dicts, fixed some bugs