pushing this up while it still works before i bust it up with some custom directives