===================================================================
--- original.js
+++ change.js
@@ -64,17 +64,17 @@
 		}
 		self.rotation = self.movement;
 	};
 });
-// Obstacle1 class
-var Obstacle1 = Container.expand(function () {
+// Obstacle class
+var Obstacle = Container.expand(function (asset, speed) {
 	var self = Container.call(this);
-	var obstacle1Graphics = self.attachAsset('obstacle1', {
+	var obstacleGraphics = self.attachAsset(asset, {
 		anchorX: 0.5,
 		anchorY: 0.5
 	});
-	// Set obstacle1 speed
-	self.speed = -5;
+	// Set obstacle speed
+	self.speed = speed;
 	// This is automatically called every game tick, if the obstacle1 is attached!
 	self.update = function () {
 		// Check if the obstacle is colliding with the shield
 		if (self.intersects(shield)) {
@@ -147,9 +147,27 @@
 
 /**** 
 * Game Code
 ****/ 
+// Wave class
 // Create a shield instance
+var Wave = function Wave(shape, amount, speed, asset) {
+	this.shape = shape;
+	this.amount = amount;
+	this.speed = speed;
+	this.asset = asset;
+	this.obstacles = [];
+	// Spawn obstacles based on wave properties
+	this.spawnObstacles = function () {
+		for (var i = 0; i < this.amount; i++) {
+			var obstacle = new Obstacle(this.asset, this.speed);
+			obstacle.x = Math.random() * 2048; // Random x position across the screen width
+			obstacle.y = 2732; // Start at the bottom of the screen
+			this.obstacles.push(obstacle);
+			game.addChild(obstacle);
+		}
+	};
+};
 var shield = game.addChildAt(new Shield(), game.children.length);
 // Position the shield at the center of the screen
 shield.x = 2048 / 2;
 shield.y = 2732 / 2;
@@ -164,35 +182,24 @@
 diver.children[0].y = diver.height / 2 - 20; // Left flipper
 diver.children[0].y = diver.children[0].y; // Right flipper
 // Set diver to a higher depth than flippers
 diver.depth = 2;
-// Create an obstacle1 instance
+// Create a wave instance
 game.move = function (x, y, obj) {
 	if (dragNode) {
 		dragNode.x = x;
 		dragNode.y = y;
 	}
 };
-var obstacles = [];
-var obstacle1 = new Obstacle1();
+var wave = new Wave('circle', 10, -5, 'obstacle1');
+wave.spawnObstacles();
 var background1 = game.addChildAt(new Background(), 0);
 background1.x = 2048 / 2;
 background1.y = 2732 / 2;
 var background2 = game.addChildAt(new Background(), 0);
 background2.x = 2048 / 2;
 background2.y = 2732 / 2 + 2732;
 game.addChild(diver);
 game.setChildIndex(diver, game.children.length - 1);
-game.addChild(obstacle1);
-// Position the obstacle1 at the bottom center of the screen
-obstacle1.x = 2048 / 2 - 100;
-obstacle1.y = 2732;
-obstacles.push(obstacle1);
-var obstacle2 = game.addChild(new Obstacle1());
-// Position the obstacle2 next to obstacle1
-obstacle2.x = 2048 / 2 + 100;
-obstacle2.y = 2732;
-obstacles.push(obstacle2);
-;
 game.up = function (x, y, obj) {
 	dragNode = null;
 };
\ No newline at end of file