New patch series - I think this has all the features and functionality
discussed so far.