moved stuff from naustadd into Drengen and made it all work