Add twig, consolidate