Minor Refacoring and Experimenting with Custom Directives.