diff --git a/core/assets/GreenButton.png b/core/assets/GreenButton.png
deleted file mode 100644
index afaa1ee..0000000
Binary files a/core/assets/GreenButton.png and /dev/null differ
diff --git a/core/assets/GreyButton.png b/core/assets/GreyButton.png
deleted file mode 100644
index 21db60c..0000000
Binary files a/core/assets/GreyButton.png and /dev/null differ
diff --git a/core/assets/LightGreyButton.png b/core/assets/LightGreyButton.png
deleted file mode 100644
index c970429..0000000
Binary files a/core/assets/LightGreyButton.png and /dev/null differ
diff --git a/core/src/com/mmog/Client.java b/core/src/com/mmog/Client.java
index c2246eb..da99ed5 100644
--- a/core/src/com/mmog/Client.java
+++ b/core/src/com/mmog/Client.java
@@ -202,15 +202,17 @@ public static boolean removeClient() {
 		toSend += getPlayer().getPlayerName();
 
 		System.out.println(toSend);
-
-		DatagramPacket datagramPacket = new DatagramPacket(toSend.getBytes(), toSend.getBytes().length, address, 7077);
+		
+		ScreenManager.getInstance().showScreen(ScreenEnum.MAIN_MENU);
+		
+		DatagramPacket datagramPacket = new DatagramPacket(toSend.getBytes(), toSend.getBytes().length, address, 7077);	     
 		try {
 			socket.send(datagramPacket);
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		ScreenManager.getInstance().showScreen(ScreenEnum.MAIN_MENU);
+		
 		return true;
 	}
 
diff --git a/core/src/com/mmog/screens/GameScreen.java b/core/src/com/mmog/screens/GameScreen.java
index 553b5b0..794a871 100644
--- a/core/src/com/mmog/screens/GameScreen.java
+++ b/core/src/com/mmog/screens/GameScreen.java
@@ -279,8 +279,7 @@ else if(p instanceof Imposter) {
 					((AdminTask) task).render(r.getBatch());
 				}
 				else if(task instanceof ReactorTask) {
-					((ReactorTask) task).render(r.getBatch());
-					//System.out.println(task.getTaskName());
+					System.out.println(task.getTaskName());
 				}
 				else if(task instanceof ElectricalTask) {
 					System.out.println(task.getTaskName());
diff --git a/core/src/com/mmog/tasks/ElecTask.java b/core/src/com/mmog/tasks/ElecTask.java
deleted file mode 100644
index 7febce5..0000000
--- a/core/src/com/mmog/tasks/ElecTask.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.mmog.tasks;
-
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.Batch;
-import com.badlogic.gdx.graphics.g2d.Sprite;
-import com.badlogic.gdx.scenes.scene2d.InputEvent;
-import com.badlogic.gdx.scenes.scene2d.Stage;
-import com.badlogic.gdx.scenes.scene2d.ui.Image;
-import com.badlogic.gdx.scenes.scene2d.utils.DragListener;
-import com.mmog.Client;
-import com.mmog.players.CrewMember;
-
-public class ElecTask extends Task {
-    final static String taskName = "Elec Task";
-
-    Stage stage;
-    Sprite BNormal, BHover, BPress;
-    final Image bNormalImg, bHoverImg, bPressImg;
-
-
-    public ElecTask() {
-        super(taskName);
-
-        //skip nodes for now - since i need multiple copies of it and have to design pseudo code to iterate seamlessly
-
-        stage = new Stage();
-
-        BNormal = new Sprite(new Texture("TaskUI/Reset Modem/panel_wifi-lever.png"));
-        BHover = new Sprite(new Texture("TaskUI/Reset Modem/panel_wifi_bg.png"));
-        BPress = new Sprite(new Texture("TaskUI/Reset Modem/panel_wifi_lidside.png"));
-
-        //Resizing because of camera zoom
-        //wifiLever.setSize(0, 0);
-        //wifiPanel.setSize(0, 0);
-        //sideLid.setSize(0, 0);
-
-        bNormalImg = new Image(BNormal);
-        bHoverImg = new Image(BHover);
-        bPressImg = new Image(BPress);
-
-        stage.addActor(bNormalImg);
-        stage.addActor(bHoverImg);
-        stage.addActor(bPressImg);
-
-        bNormalImg.setPosition(stage.getWidth() /2 - 200, stage.getHeight() / 2 - 250);
-        bHoverImg.setPosition(stage.getWidth() /2 + 75, stage.getHeight() / 2 + 135);
-        bPressImg.setPosition(stage.getWidth() /2 - 390, stage.getHeight() / 2 - 290);
-
-        bNormalImg.addListener(new DragListener() {
-            @Override
-            public boolean touchDown(InputEvent e, float x, float y, int pointer, int button) {
-
-                return true;
-            }
-
-            @Override
-            public void touchDragged(InputEvent e, float x, float y, int pointer) {
-                bNormalImg.setPosition(bNormalImg.getX(), bNormalImg.getY() - y);
-
-            }
-
-            @Override
-            public void touchUp (InputEvent event, float x, float y, int pointer, int button) {
-
-            }
-
-        });
-    }
-
-
-    public void render(Batch batch) {
-        ((CrewMember) Client.getPlayer()).draw(batch);
-        Gdx.input.setInputProcessor(stage);
-        stage.draw();
-
-		/*
-		if(completed) {
-			System.out.println("SUCCESS!");
-			((CrewMember) Client.getPlayer()).setCurrentTask(null);
-			((CrewMember) Client.getPlayer()).setTaskCompleted(taskName);
-		}
-
-		*/
-    }
-
-}
diff --git a/core/src/com/mmog/tasks/ReactorTask.java b/core/src/com/mmog/tasks/ReactorTask.java
index b3315a3..01de60d 100644
--- a/core/src/com/mmog/tasks/ReactorTask.java
+++ b/core/src/com/mmog/tasks/ReactorTask.java
@@ -1,395 +1,9 @@
 package com.mmog.tasks;
 
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.Batch;
-import com.badlogic.gdx.graphics.g2d.BitmapFont;
-import com.badlogic.gdx.graphics.g2d.NinePatch;
-import com.badlogic.gdx.graphics.g2d.Sprite;
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.InputEvent;
-import com.badlogic.gdx.scenes.scene2d.Stage;
-import com.badlogic.gdx.scenes.scene2d.Touchable;
-import com.badlogic.gdx.scenes.scene2d.ui.*;
-import com.badlogic.gdx.scenes.scene2d.utils.*;
-import com.badlogic.gdx.utils.TimeUtils;
-import com.badlogic.gdx.scenes.scene2d.ui.Label.LabelStyle;
-import com.mmog.Client;
-import com.mmog.players.CrewMember;
-import com.mmog.screens.MainScreen;
-import com.mmog.screens.ScreenEnum;
-import com.mmog.screens.ScreenManager;
-
-import java.util.ArrayList;
-import java.util.Random;
-
 public class ReactorTask extends Task {
 	final static String taskName = "Reactor Task";
-	Table table, a;
-	TextField crewMemberID;
-	Stage stage;
-	//Sprite nbutton, hbutton, pbutton;
-	public boolean completed = false;
-	TextButton b1, b2, b3, b4, b5, b6, b7, b8, b9, b10;
-	TextButton.TextButtonStyle textButtonStyleN;
-	Integer[] array;
-	private static Integer current;
-
+	
 	public ReactorTask() {
 		super(taskName);
-
-		stage = new Stage();
-		setGame();
-
-	}
-
-	public void setGame(){
-		table = new Table();
-		table.setFillParent(true);
-		float MAX_WIDTH = Gdx.graphics.getWidth();
-		float MAX_HEIGTH = Gdx.graphics.getHeight();
-		table.setSize(MAX_WIDTH, MAX_HEIGTH);
-		table.center();
-
-		textButtonStyleN = new TextButton.TextButtonStyle();
-		textButtonStyleN.up = new TextureRegionDrawable(new Texture("GreyButton.png"));
-		textButtonStyleN.down = new TextureRegionDrawable(new Texture("GreenButton.png"));
-		textButtonStyleN.over = new TextureRegionDrawable(new Texture("LightGreyButton.png"));
-		textButtonStyleN.disabled = new TextureRegionDrawable(new Texture("GreenButton.png"));
-		BitmapFont font = new BitmapFont(Gdx.files.internal("UI/newlabelfont.fnt"));
-		font.getData().setScale(0.4f);
-		textButtonStyleN.font = font;
-		textButtonStyleN.fontColor = Color.BLACK;
-		textButtonStyleN.downFontColor = Color.DARK_GRAY;
-
-		array = new Integer[10];
-		for (Integer i = 0; i<array.length; i++){
-			array[i] = i+1;
-		}
-		randomizeArray(array);
-		System.out.println("Hello Tareq");
-		for (int i = 0; i < array.length; i++)
-		{
-			System.out.print(array[i] + " \n");
-		}
-		current = 0;
-		b1 = new TextButton(array[0].toString(), textButtonStyleN);
-		b2 = new TextButton(array[1].toString(), textButtonStyleN);
-		b3 = new TextButton(array[2].toString(), textButtonStyleN);
-		b4 = new TextButton(array[3].toString(), textButtonStyleN);
-		b5 = new TextButton(array[4].toString(), textButtonStyleN);
-		b6 = new TextButton(array[5].toString(), textButtonStyleN);
-		b7 = new TextButton(array[6].toString(), textButtonStyleN);
-		b8 = new TextButton(array[7].toString(), textButtonStyleN);
-		b9 = new TextButton(array[8].toString(), textButtonStyleN);
-		b10 = new TextButton(array[9].toString(), textButtonStyleN);
-		table.row().colspan(5);
-		table.add(b1,b2,b3,b4,b5);
-		table.row().colspan(5);
-		table.add(b6,b7,b8,b9,b10);
-		stage.addActor(table);
-
-		b1.addListener(new ClickListener() {
-			@Override
-			public void clicked(InputEvent event, float x, float y) {
-				System.out.println("Button 1 Clicked");
-				String str = b1.toString();
-				String num = str.substring(str.lastIndexOf(" ")+1);
-				Integer a = Integer.parseInt(num);
-				if (buttonPressed(a)) {
-					//Button becomes green and disabled
-					System.out.println("Good Button");
-					b1.setTouchable(Touchable.disabled);
-					b1.setDisabled(true);
-					if(lastNumber()){
-						completed = true;
-					}
-				}
-				else {
-					System.out.println("Bad Button");
-					enableAll();
-					current = 0;
-				}
-			}
-		});
-		b2.addListener(new ClickListener() {
-			@Override
-			public void clicked(InputEvent event, float x, float y) {
-				System.out.println("Button 2 Clicked");
-				String str = b2.toString();
-				String num = str.substring(str.lastIndexOf(" ")+1);
-				Integer a = Integer.parseInt(num);
-				if (buttonPressed(a)) {
-					//Button becomes green and disabled
-					System.out.println("Good Button");
-					b2.setDisabled(true);
-					b2.setTouchable(Touchable.disabled);
-					if(lastNumber()){
-						completed = true;
-					}
-				}
-				else {
-					System.out.println("Bad Button");
-					enableAll();
-					current = 0;
-				}
-			}
-		});
-
-		b3.addListener(new ClickListener() {
-			@Override
-			public void clicked(InputEvent event, float x, float y) {
-				System.out.println("Button 3 Clicked");
-				String str = b3.toString();
-				String num = str.substring(str.lastIndexOf(" ")+1);
-				Integer a = Integer.parseInt(num);
-				if (buttonPressed(a)) {
-					//Button becomes green and disabled
-					System.out.println("Good Button");
-					b3.setDisabled(true);
-					b3.setTouchable(Touchable.disabled);
-					if(lastNumber()){
-						completed = true;
-					}
-				}
-				else {
-					System.out.println("Bad Button");
-					enableAll();
-					current = 0;
-				}
-			}
-		});
-
-		b4.addListener(new ClickListener() {
-			@Override
-			public void clicked(InputEvent event, float x, float y) {
-				System.out.println("Button 4 Clicked");
-				String str = b4.toString();
-				String num = str.substring(str.lastIndexOf(" ")+1);
-				Integer a = Integer.parseInt(num);
-				if (buttonPressed(a)) {
-					//Button becomes green and disabled
-					System.out.println("Good Button");
-					b4.setDisabled(true);
-					b4.setTouchable(Touchable.disabled);
-					if(lastNumber()){
-						completed = true;
-					}
-				}
-				else {
-					System.out.println("Bad Button");
-					enableAll();
-					current = 0;
-				}
-			}
-		});
-		b5.addListener(new ClickListener() {
-			@Override
-			public void clicked(InputEvent event, float x, float y) {
-				System.out.println("Button 5 Clicked");
-				String str = b5.toString();
-				String num = str.substring(str.lastIndexOf(" ")+1);
-				Integer a = Integer.parseInt(num);
-				if (buttonPressed(a)) {
-					//Button becomes green and disabled
-					System.out.println("Good Button");
-					b5.setTouchable(Touchable.disabled);
-					b5.setDisabled(true);
-					if(lastNumber()){
-						completed = true;
-					}
-				}
-				else {
-					System.out.println("Bad Button");
-					enableAll();
-					current = 0;
-				}
-			}
-		});
-
-		b6.addListener(new ClickListener() {
-			@Override
-			public void clicked(InputEvent event, float x, float y) {
-				System.out.println("Button 6 Clicked");
-				String str = b6.toString();
-				String num = str.substring(str.lastIndexOf(" ")+1);
-				Integer a = Integer.parseInt(num);
-				if (buttonPressed(a)) {
-					//Button becomes green and disabled
-					System.out.println("Good Button");
-					b6.setTouchable(Touchable.disabled);
-					b6.setDisabled(true);
-					if(lastNumber()){
-						completed = true;
-					}
-				}
-				else {
-					System.out.println("Bad Button");
-					enableAll();
-					current = 0;
-				}
-			}
-		});
-
-		b7.addListener(new ClickListener() {
-			@Override
-			public void clicked(InputEvent event, float x, float y) {
-				System.out.println("Button 7 Clicked");
-				String str = b7.toString();
-				String num = str.substring(str.lastIndexOf(" ")+1);
-				Integer a = Integer.parseInt(num);
-				if (buttonPressed(a)) {
-					//Button becomes green and disabled
-					System.out.println("Good Button");
-					b7.setTouchable(Touchable.disabled);
-					b7.setDisabled(true);
-					if(lastNumber()){
-						completed = true;
-					}
-				}
-				else {
-					System.out.println("Bad Button");
-					enableAll();
-					current = 0;
-				}
-			}
-		});
-
-		b8.addListener(new ClickListener() {
-			@Override
-			public void clicked(InputEvent event, float x, float y) {
-				System.out.println("Button 8 Clicked");
-				String str = b8.toString();
-				String num = str.substring(str.lastIndexOf(" ")+1);
-				Integer a = Integer.parseInt(num);
-				if (buttonPressed(a)) {
-					//Button becomes green and disabled
-					System.out.println("Good Button");
-					b8.setTouchable(Touchable.disabled);
-					b8.setDisabled(true);
-					if(lastNumber()){
-						completed = true;
-					}
-				}
-				else {
-					System.out.println("Bad Button");
-					enableAll();
-					current = 0;
-				}
-			}
-		});
-
-		b9.addListener(new ClickListener() {
-			@Override
-			public void clicked(InputEvent event, float x, float y) {
-				System.out.println("Button 9 Clicked");
-				String str = b9.toString();
-				String num = str.substring(str.lastIndexOf(" ")+1);
-				Integer a = Integer.parseInt(num);
-				if (buttonPressed(a)) {
-					//Button becomes green and disabled
-					System.out.println("Good Button");
-					b9.setTouchable(Touchable.disabled);
-					b9.setDisabled(true);
-					if(lastNumber()){
-						completed = true;
-					}
-				}
-				else {
-					System.out.println("Bad Button");
-					enableAll();
-					current = 0;
-				}
-			}
-		});
-
-		b10.addListener(new ClickListener() {
-			@Override
-			public void clicked(InputEvent event, float x, float y) {
-				System.out.println("Button 10 Clicked");
-				String str = b10.toString();
-				String num = str.substring(str.lastIndexOf(" ")+1);
-				Integer a = Integer.parseInt(num);
-				if (buttonPressed(a)) {
-					//Button becomes green and disabled
-					System.out.println("Good Button");
-					b10.setTouchable(Touchable.disabled);
-					b10.setDisabled(true);
-					if(lastNumber()){
-						completed = true;
-					}
-				}
-				else {
-					System.out.println("Bad Button");
-					enableAll();
-					current = 0;
-				}
-			}
-		});
-	}
-
-	public static void randomizeArray(Integer[] a) {
-		int n = a.length;
-		Random random = new Random();
-		random.nextInt();
-		for (int i = 0; i < n; i++){
-			int change = i + random.nextInt(n - i);
-			Integer helper = a[i];
-			a[i] = a[change];
-			a[change] = helper;
-		}
-	}
-
-	public static Boolean lastNumber(){
-		if(current == 10){
-			return true;
-		}
-		return false;
-	}
-
-	public static Boolean buttonPressed(Integer num){
-		if(num == current + 1){
-			current += 1;
-			return true;
-		}
-		return false;
 	}
-
-	public void render(Batch batch){
-		((CrewMember) Client.getPlayer()).draw(batch);
-		Gdx.input.setInputProcessor(stage);
-		stage.draw();
-
-		if(completed) {
-			System.out.println("SUCCESS!");
-			((CrewMember) Client.getPlayer()).setCurrentTask(null);
-			((CrewMember) Client.getPlayer()).setTaskCompleted(taskName);
-		}
-	}
-
-	public void enableAll(){
-		b1.setDisabled(false);
-		b1.setTouchable(Touchable.enabled);
-		b2.setDisabled(false);
-		b2.setTouchable(Touchable.enabled);
-		b3.setDisabled(false);
-		b3.setTouchable(Touchable.enabled);
-		b4.setDisabled(false);
-		b4.setTouchable(Touchable.enabled);
-		b5.setDisabled(false);
-		b5.setTouchable(Touchable.enabled);
-		b6.setDisabled(false);
-		b6.setTouchable(Touchable.enabled);
-		b7.setDisabled(false);
-		b7.setTouchable(Touchable.enabled);
-		b8.setDisabled(false);
-		b8.setTouchable(Touchable.enabled);
-		b9.setDisabled(false);
-		b9.setTouchable(Touchable.enabled);
-		b10.setDisabled(false);
-		b10.setTouchable(Touchable.enabled);
-	}
-
-
 }