Move to using pongo for templating