diff --git a/JobHarvester.js b/JobHarvester.js
index d5f5d55..29d65d7 100644
--- a/JobHarvester.js
+++ b/JobHarvester.js
@@ -2,6 +2,7 @@ module.exports = {
     begin(creep){
         const jobMemory = creep.memory.job; 
         if(!jobMemory.harvesting) creep.memory.job.harvesting = false;
+        if(!jobMemory.counter) creep.memory.job.counter = 0;
     },
     
     tick(creep){
@@ -12,10 +13,25 @@ module.exports = {
             else creep.moveTo(source);
             if(!creep.store.getFreeCapacity(RESOURCE_ENERGY)) jobMemory.harvesting = false;
         } else{
-            const controller = creep.room.controller;
-            if(creep.pos.isNearTo(controller)) creep.upgradeController(controller);
-            else creep.moveTo(controller);
-            if(!creep.store.getUsedCapacity(RESOURCE_ENERGY)) jobMemory.harvesting = true;
+            var target;
+            switch (jobMemory.counter%3) {
+                case 0: target = creep.room.controller; break;
+                case 1: target = creep.pos.findClosestByRange(FIND_MY_STRUCTURES, {filter:{structureType:STRUCTURE_SPAWN}}); break;
+                case 2: target = creep.pos.findClosestByRange(FIND_MY_CONSTRUCTION_SITES); break;
+            }           
+            
+            if(creep.pos.isNearTo(target)) {
+                switch (jobMemory.counter%3) {
+                    case 0: creep.upgradeController(target); break;
+                    case 1: creep.transfer(target, RESOURCE_ENERGY); break;
+                    case 2: creep.build(target); break;
+                }
+            }
+            else creep.moveTo(target);
+            if(!creep.store.getUsedCapacity(RESOURCE_ENERGY)) {
+                jobMemory.harvesting = true;
+                creep.memory.job.counter += 1;
+            }
         }
     }
 }
\ No newline at end of file