mostly done, additionall comments and checks needed