Vastly simplify the templates