I think I got it all.  you should really make it easier to exchange functinality implementations
Merge branch 'noty' into development