Frank,
Please excuse the latency of my reply!
In regards to the WiFi LAN, just remove the CAT 5 cables on the LAN drawing I posted previously.
Instead, add an antenna at each NIC per workstation / node, and one antenna at the Switch (hub).
When I get some time, I'll post a marked up WiFi LAN map for you.
Scott35