Um, tell me if it breaks.

Fixed some connections. Tell me if breaks.