Rewritten commute form to use templates.