did some cool stuff
merge conflicts