Second Rehaul

Templating in Progress