wip
refactoring to separate services from directives, working towards getting markup out of the .js