Patch Set 5: Looks good to me, approved; Build Successful; IP review completed

I'm happy enough with this change. It needs a bit more work but we can work on that in the future. Thanks for your feedback earlier.