uploading to new schema
cleaned up some dags in the templates
about to merge