fuck you chris
merge conflicts fixed
current merged version