Incomplete
Nuget fix
Nuget fix works