Re-work socket types
Major bump for async rewrite