diff --git a/hoot-core/src/main/cpp/hoot/core/elements/VersionUtils.cpp b/hoot-core/src/main/cpp/hoot/core/elements/VersionUtils.cpp
new file mode 100644
index 0000000..1dc6cdc
--- /dev/null
+++ b/hoot-core/src/main/cpp/hoot/core/elements/VersionUtils.cpp
@@ -0,0 +1,77 @@
+/*
+ * This file is part of Hootenanny.
+ *
+ * Hootenanny is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --------------------------------------------------------------------
+ *
+ * The following copyright notices are generated automatically. If you
+ * have a new notice to add, please use the format:
+ * " * @copyright Copyright ..."
+ * This will properly maintain the copyright information. DigitalGlobe
+ * copyrights will be updated automatically.
+ *
+ * @copyright Copyright (C) 2020 DigitalGlobe (http://www.digitalglobe.com/)
+ */
+
+#include "VersionUtils.h"
+
+// Hoot
+#include <hoot/core/util/HootException.h>
+#include <hoot/core/util/Log.h>
+#include <hoot/core/criterion/AttributeValueCriterion.h>
+#include <hoot/core/visitors/FilteredVisitor.h>
+#include <hoot/core/visitors/ElementCountVisitor.h>
+#include <hoot/core/util/StringUtils.h>
+#include <hoot/core/visitors/UniqueElementIdVisitor.h>
+
+namespace hoot
+{
+
+int VersionUtils::versionLessThanOneCount(const OsmMapPtr& map)
+{
+ std::shared_ptr<AttributeValueCriterion> attrCrit(
+ new AttributeValueCriterion(
+ ElementAttributeType(ElementAttributeType::Version), 1, NumericComparisonType::LessThan));
+ return
+ (int)FilteredVisitor::getStat(
+ attrCrit, std::shared_ptr<ElementCountVisitor>(new ElementCountVisitor()), map);
+}
+
+bool VersionUtils::checkVersionLessThanOneCountAndLogWarning(const OsmMapPtr& map)
+{
+ const int numberOfRefElementsWithVersionLessThan1 = versionLessThanOneCount(map);
+ if (numberOfRefElementsWithVersionLessThan1 > 0)
+ {
+ LOG_WARN(
+ StringUtils::formatLargeNumber(numberOfRefElementsWithVersionLessThan1) << " features in " <<
+ "the reference map have a version less than one. This could lead to difficulties when " <<
+ "applying the resulting changeset back to an authoritative data store. Are the versions " <<
+ "on the features being populated correctly?");
+ return true;
+ }
+ return false;
+}
+
+std::set<ElementId> VersionUtils::getIdsOfElementsWithVersionLessThanOne(const OsmMapPtr& map)
+{
+ AttributeValueCriterion attrCrit(
+ ElementAttributeType(ElementAttributeType::Version), 1, NumericComparisonType::LessThan);
+ UniqueElementIdVisitor idSetVis;
+ FilteredVisitor filteredVis(attrCrit, idSetVis);
+ map->visitRo(filteredVis);
+ return idSetVis.getElementSet();
+}
+
+}