More mesh stuff.. not yet optimal