This refs #11 and I cleaned code up in the twig files.