Added some directives.
Added some support for grouping data, but will need to create services for all the data that I have.