attempt at geting it into nuget and working cleanly