moving things into directives.