OK it is done.  This solve was a nightmare, the fire side atoms just did not work no matter what I tried.  Eventually got this layout albeit a few latency slower than I'd like, I'm pretty happy with the result.