Working through demo
More directives stuff.
Finishing Directives stuff