diff --git a/02-oop-inheritance/fun.js b/02-oop-inheritance/fun.js
new file mode 100644
index 000000000..955570802
--- /dev/null
+++ b/02-oop-inheritance/fun.js
@@ -0,0 +1,52 @@
+class movie { // Making class movie
+
+	constructor(title, year, duration){
+		this.title = title;
+		this.year = year;
+		this.duration = duration;
+	}
+
+	
+
+	play(title){
+	   var playVideo = document.getElementById(title);
+	   playVideo.reset();
+	   playVideo.play();
+  	}
+  	pause(title){
+	   var pauseVideo = document.getElementById(title);
+	   pauseVideo.pause();
+	}
+  	resume(title){
+	   var resumeVideo = document.getElementById(title);
+	   resumeVideo.play();
+	}
+ }
+
+function playVideo(data) {
+			var myVideo = document.getElementById(data);
+            myVideo.play(data);
+        }
+
+function pauseVideo(data) {
+            var myVideo = document.getElementById(data);
+            myVideo.pause(data);
+        }
+
+function resumeVideo(data) {
+			var myVideo = document.getElementById(data);
+			console.log(myVideo);
+			myVideo.resume(data);
+}
+
+
+// instance of objects movie.
+// Not sure what do you mean when you say "play with them in the console."
+
+ let StarWars = new movie("Star Wars - A new hope", "1977", "2h 5m");
+ let Interstellar = new movie("Interstellar", "2014", "2h 49m");
+ let TheGodfather = new movie("The Godfather", "1972", "2h 58m");
+ console.log(StarWars);
+ console.log(Interstellar);
+ console.log(TheGodfather);
+
diff --git a/02-oop-inheritance/fun2.js b/02-oop-inheritance/fun2.js
new file mode 100644
index 000000000..4105314f8
--- /dev/null
+++ b/02-oop-inheritance/fun2.js
@@ -0,0 +1,98 @@
+class EventEmitter {
+
+      constructor() {
+        this.listeners = {
+
+        }
+      }
+      on(event, listener) {
+          if ('event' in this.listeners) {
+            this.listeners[event].push(listener);
+          }
+          this.listeners[event] = [];
+          
+      }
+      emit(event) { // don't sure what to do here
+          
+          console.log(this.listeners[event]);
+          /*this.listeners[event].forEach(function(fn){
+              console.log("executing a listener");
+              fn.call(window.event);
+          })*/
+      }
+      off(event, listener) {
+          if ('event' in this.listeners){
+            var del = this.listeners[event].pop();
+            console.log("Deleted", del);
+          }
+          else {
+            console.log("empty");
+          }
+      }
+}
+
+
+class movie extends EventEmitter {
+      constructor(title, year, duration) {
+          super();
+          this.title = title;
+          this.year = year;
+          this.duration = duration;
+      }
+
+      play() {
+          console.log("playing ", this.title);
+          super.emit('play');
+      }
+      pause() {
+          super.emit('pause');
+      }
+
+      resume() {
+          super.emit('resume');
+      }
+
+}
+
+// functions for play pause and resume
+
+function playVideo(data){
+  var video = document.getElementById(data);
+  video.play();
+  if(data.value=="Resume")
+  {
+  data.value="Play";
+  }
+ }
+
+function pauseVideo(data) {
+      var myVideo = document.getElementById(data);
+      myVideo.pause(data);
+}
+
+function resumeVideo(data) {
+      var myVideo = document.getElementById(data);
+      console.log(myVideo);
+      myVideo.resume(data);
+}
+
+var myEventEmitter = new EventEmitter();
+ myEventEmitter.on('Play Event', playVideo);
+
+var firstEventButton = document.getElementById("firstEvent");
+ firstEventButton.addEventListener('click', function(){
+  myEventEmitter.emit('Play Event');
+ },false);
+ console.log(myEventEmitter);
+
+
+
+// instances
+
+ var StarWars = new movie("Star Wars - A new hope", "1977", "2h 5m");
+ var Interstellar = new movie("Interstellar", "2014", "2h 49m");
+ var TheGodfather = new movie("The Godfather", "1972", "2h 58m");
+ console.log(StarWars);
+ console.log(Interstellar);
+ console.log(TheGodfather);
+
diff --git a/02-oop-inheritance/index.html b/02-oop-inheritance/index.html
new file mode 100644
index 000000000..219cfd8e0
--- /dev/null
+++ b/02-oop-inheritance/index.html
@@ -0,0 +1,27 @@
+<!doctype html>
+
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+
+  <title>Topic 02</title> 
+  <meta name="description" content="Exercises">
+  <meta name="author" content="Martin Aranda">
+</head>
+
+<body>
+	
+
+	<section>
+		<div>
+			<video id="Star Wars" src="video_1.mp4">
+			</video>
+			<input id ="firstEvent" type="button" onclick="playVideo('Star Wars')" value="Play" ></input>
+			<input type="button" onclick="pauseVideo('Star Wars')" value="Pause"></input>
+			<input type="button" onclick="resumeVideo('Star Wars')" value="Resume"></input>
+		</div>
+	</section>
+
+	<script src="fun2.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/02-oop-inheritance/video_1.mp4 b/02-oop-inheritance/video_1.mp4
new file mode 100755
index 000000000..416fe19cd
Binary files /dev/null and b/02-oop-inheritance/video_1.mp4 differ