stubbed out some directives last week, forgot to commit
resolving conflict using theirs
btFromNow. still need to reformat language