APY-13 : Complete the security gateway

Changes to the wire and event container systems.