Refactoring, commented out anything "twig" for now