30 3 form

Yeah, this may require a larger rethink of if we need a directive at all, and if so how to best use it.