Rewritten mesh and dependencies, tested
clean up for merge
Merge commit 'eeef36fd55bcac74fa18975bd3eef03c553ba807'