massive update. Still quite unfinnished