Taps kmf master

Code from TAPS.  Review for relevant.