diff --git a/src/ol/feature.js b/src/ol/feature.js
new file mode 100644
index 0000000000..6414970982
--- /dev/null
+++ b/src/ol/feature.js
@@ -0,0 +1,119 @@
+goog.provide('ol.Feature');
+
+goog.require('goog.events');
+goog.require('goog.events.EventType');
+goog.require('ol.Object');
+goog.require('ol.geom.Geometry');
+
+
+/**
+ * @enum {string}
+ */
+ol.FeatureProperty = {
+  GEOMETRY: 'geometry'
+};
+
+
+
+/**
+ * @constructor
+ * @extends {ol.Object}
+ * @param {ol.geom.Geometry|Object.<string, *>} geometryOrValues Values.
+ */
+ol.Feature = function(geometryOrValues) {
+
+  goog.base(this);
+
+  /**
+   * @private
+   * @type {number}
+   */
+  this.revision_ = 0;
+
+  /**
+   * @private
+   * @type {goog.events.Key}
+   */
+  this.geometryChangeKey_ = null;
+
+  goog.events.listen(
+      this, ol.Object.getChangeEventType(ol.FeatureProperty.GEOMETRY),
+      this.handleGeometryChanged_, false, this);
+
+  if (geometryOrValues instanceof ol.geom.Geometry) {
+    var geometry = /** @type {ol.geom.Geometry} */ (geometryOrValues);
+    this.setGeometry(geometry);
+  } else {
+    var values = /** @type {Object.<string, *>} */ (geometryOrValues);
+    this.setValues(values);
+  }
+
+};
+goog.inherits(ol.Feature, ol.Object);
+
+
+/**
+ * FIXME empty description for jsdoc
+ */
+ol.Feature.prototype.dispatchChangeEvent = function() {
+  ++this.revision_;
+  this.dispatchEvent(goog.events.EventType.CHANGE);
+};
+
+
+/**
+ * @return {ol.geom.Geometry|undefined} Geometry.
+ */
+ol.Feature.prototype.getGeometry = function() {
+  return /** @type {ol.geom.Geometry|undefined} */ (
+      this.get(ol.FeatureProperty.GEOMETRY));
+};
+goog.exportProperty(
+    ol.Feature.prototype,
+    'getGeometry',
+    ol.Feature.prototype.getGeometry);
+
+
+/**
+ * @return {number} Revision.
+ */
+ol.Feature.prototype.getRevision = function() {
+  return this.revision_;
+};
+
+
+/**
+ * @private
+ */
+ol.Feature.prototype.handleGeometryChange_ = function() {
+  this.dispatchChangeEvent();
+};
+
+
+/**
+ * @private
+ */
+ol.Feature.prototype.handleGeometryChanged_ = function() {
+  if (!goog.isNull(this.geometryChangeKey_)) {
+    goog.events.unlistenByKey(this.geometryChangeKey_);
+    this.geometryChangeKey_ = null;
+  }
+  var geometry = this.getGeometry();
+  if (goog.isDef(geometry)) {
+    this.geometryChangeKey_ = goog.events.listen(geometry,
+        goog.events.EventType.CHANGE, this.handleGeometryChange_, false, this);
+  }
+  this.dispatchChangeEvent();
+};
+
+
+/**
+ * @param {ol.geom.Geometry|undefined} geometry Geometry.
+ */
+ol.Feature.prototype.setGeometry = function(geometry) {
+  this.set(ol.FeatureProperty.GEOMETRY, geometry);
+};
+goog.exportProperty(
+    ol.Feature.prototype,
+    'setGeometry',
+    ol.Feature.prototype.setGeometry);