Rewritten mesh and dependencies, tested