add extra condition to DContextApplication
work through some of the sanity tests