Update Work in progress

Modified the templates even further.