Major overhaul aligned to the C# lite version

Much smaller code-base, more efficient