mostly there
seems to be working ok now
cleaning up
Merge branch 'nuget'