Design cleanup, intro ingress