Started working on classes, everything is borked rn though

role.base.js

@@ -0,0 +1,15 @@
+class roleBase{
+	constructor(){
+		this.body = [ MOVE, WORK, CARRY ];
+		this.name = 'Creep';
+	}
+    /** @param {Creep} creep **/
+    run(creep) { }
+	spawn(spawn){
+		spawn.spawnCreep(this.body, this.name + Game.time,
+			memory : {role : this.name}
+		});
+	}
+};
+
+module.exports = roleBase;

role.dispatcher.js

@@ -37,8 +37,7 @@ function spawnCreeps(spawn){
     
         if(roleCreeps.length < count && !spawn.spawning) {
             var newName = role + Game.time;
-            console.log(spawn.spawnCreep(roleMap[role].body, newName,
+            roleMap[role].spawn(spawn);
-                {memory: {role: role}}));
             break;
         }
     }

role.guard.js

@@ -5,8 +5,6 @@ const body = [
 ];
 
 var roleGuard = {
-	body,
-
     /** @param {Creep} creep **/
     run: function(creep) {
 		const target = creep.pos.findClosestByRange(FIND_HOSTILE_CREEPS);
@@ -16,7 +14,16 @@ var roleGuard = {
 			}
 	  	}
         else {
-			creep.moveTo(Game.flags.IdleArea);
+			var currentWaypoint = Game.flags[creep.memory.waypoints[creep.memory.currentWaypoint]];
+			if(getRangeTo(currentWaypoint) > 0){
+				creep.moveTo(currentWaypoint);
+			}
+			else{
+				creep.memory.currentWaypoint += 1;
+				if(creep.memory.currentWaypoint > creep.memory.waypoints.length){
+					creep.memory.currentWaypoint = 0;
+				}
+			}
         }
     }
 };