Added ability to chose between basic and enhanced,

Updated listener to a working C# listener.