Updated the templates to be more dynamic, added some of the WTSDA requirements too.