Sounds good.

With the G7 i know Stew did some rather nice improvements in the way the storm evacuates water out of the block by making it a hybird 3 -> 2 fitting block.