Cleaning up my directives.  Starting work on new/collection controller.