Minor aesthetic changes
Adding socket connector support. First pass
Next version