More messing around with scope and directives