added implemented cache and display
Merge branch 'ulf' into dave
resolving merge conflicts. keep adsbacamo
renaming active foo to match naming conventions