A Lot more clean-up:  Added metric/controller to determine when to fuzzy flock vs. hard flock.