cool mesh stuff
fixed merge conflicts