           exit 1
         fi
 
+        # Check everything else
         check
+
+        # Do npm i incase of packages.json changes
         npm i --silent
+
         # this is a temporary adition, normally file watcher should delete the created file later on
         cd #{projectRoot}/go/bin
-        rm goldorf-main-*
-        rm watcher-*
+
+        # Remove old watcher files (do we still need this?)
+        rm -rf goldorf-main-*
+        rm -rf watcher-*
+
+        # Run Go builder
         #{projectRoot}/go/build.sh
+
+        # Run Social Api builder
         cd #{projectRoot}/go/src/socialapi
         make configure
+
         cd #{projectRoot}
 
+        # Do PG Migration if necessary
         migrate up
-        # a temporary migration line
+
+        # a temporary migration line (do we still need this?)
         env PGPASSWORD=#{postgres.password} psql -tA -h #{postgres.host} #{postgres.dbname} -U #{postgres.username} -c "ALTER TYPE \"api\".\"channel_type_constant_enum\" ADD VALUE IF NOT EXISTS 'collaboration';"
 
+        # Run all the worker daemons in KONFIG.workers
         #{("worker_daemon_"+key+"\n" for key,val of KONFIG.workers).join(" ")}
 
+        # Check backend option, if it's then bypass client build
+        if [ "$1" == "backend" ] ; then
+
+          echo
+          echo '---------------------------------------------------------------'
+          echo '>>> CLIENT BUILD DISABLED! DO "cd client/ && make" MANUALLY <<<'
+          echo '---------------------------------------------------------------'
+          echo
+
+        else
+          cd #{projectRoot}/client && make &
+        fi
+
+        # Show the all logs of workers
         tail -fq ./.logs/*.log
 
       }

          migrate $2 $3
        fi

      elif [ "$#" == "0" ]; then

        checkrunfile
        run

      else
        echo "Unknown command: $1"

        echo "Usage: "
        echo ""
        echo "  run                       : to start koding"
        echo "  run backend               : to start only backend of koding"
        echo "  run killall               : to kill every process started by run script"
        echo "  run install               : to compile/install client and "
        echo "  run buildclient           : to see of specified worker logs only"
