Refactor, moved batches to submesh