stuff

I am merging this stuff