diff --git a/README.md b/README.md
index 19ba88c75..6b74281b3 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # Music Visualiser Project
 
-Name:
-
-Student Number: 
+Names: Gabriel Plaza and Sean Lawless
+ 
+Student Numbers: (Gabriel)C20474596, (Sean)C20447296 
 
 ## Instructions
 - Fork this repository and use it a starter project for your assignment
@@ -12,6 +12,7 @@ Student Number:
 - Check out the WaveForm and AudioBandsVisual for examples of how to call the Processing functions from other classes that are not subclasses of PApplet
 
 # Description of the assignment
+Object Oriented Programming group assignment to create an audio visualiser using java processing libraries. 
 
 # Instructions
 
diff --git a/java/data/light.mp3 b/java/data/light.mp3
new file mode 100644
index 000000000..e90e9d223
Binary files /dev/null and b/java/data/light.mp3 differ
diff --git a/java/data/rain.mp3 b/java/data/rain.mp3
new file mode 100644
index 000000000..704bc45ef
Binary files /dev/null and b/java/data/rain.mp3 differ
diff --git a/java/data/tevvez.mp3 b/java/data/tevvez.mp3
new file mode 100644
index 000000000..7479007f1
Binary files /dev/null and b/java/data/tevvez.mp3 differ
diff --git a/java/src/c123456/BryansVisual.java b/java/src/c123456/BryansVisual.java
deleted file mode 100644
index e69de29bb..000000000
diff --git a/java/src/c20474596/Main.java b/java/src/c20474596/Main.java
new file mode 100644
index 000000000..bab356ee8
--- /dev/null
+++ b/java/src/c20474596/Main.java
@@ -0,0 +1,15 @@
+package c20474596;
+
+public class Main{
+
+    public static void Start(){
+		String[] a = {"MAIN"};
+        processing.core.PApplet.runSketch( a, new Runner());
+    }
+
+    public static void main(String[] args){
+        Start();
+    }
+
+}
+    
diff --git a/java/src/c20474596/Runner.java b/java/src/c20474596/Runner.java
new file mode 100644
index 000000000..95294d3d2
--- /dev/null
+++ b/java/src/c20474596/Runner.java
@@ -0,0 +1,194 @@
+package c20474596;
+import ddf.minim.AudioBuffer;
+import ddf.minim.AudioInput;
+import ddf.minim.AudioPlayer;
+import ddf.minim.Minim;
+import ddf.minim.analysis.FFT;
+
+public class Runner extends Visual{
+    Minim minim;
+    AudioPlayer ap;
+    AudioInput ai;
+    AudioBuffer ab;
+    Star[] stars = new Star[900];
+    float px;
+    float py;
+    int mode = 0;
+    float smoothedBoxSize = 0;
+    float angle = 0;
+    //sean edits
+    int c = 16;
+    float t = 1;
+    int nprime = 1;
+    float hue;
+    FFT fft; // Object that performs Fast Fourier Transform (FFT)
+    int OFF_MAX= 300;
+    drop d;
+    drop[] drops= new drop[500];
+    float radius = 200;
+    float rot = 0;
+
+    public void setup(){
+        for(int i = 0; i < stars.length; i++){
+            stars[i] = new Star();
+        }
+        minim=new Minim(this);
+        startMinim();
+        getFFT();
+        loadAudio("light.mp3");
+        colorMode(HSB,255);   
+        hue = random(255);
+        //sean edits
+        noStroke();
+        for(int i =0;i<drops.length; i++){
+            drops[i]= new drop();
+        }
+    }
+
+    public void keyPressed(){
+        if (key >= '0' && key <= '9') {
+			mode = key - '0';
+		}
+        if (key == ' ')
+        {
+            getAudioPlayer().cue(0);
+            getAudioPlayer().play();
+        }
+    }
+
+    public void settings(){
+        size(800,800,P3D);
+        fullScreen(P3D, SPAN);
+    }
+
+    public void draw(){
+        background(0);
+        if(key == '1' || key == '2' || key == ' '){ //ensure everything is centered in visual 1 and 2
+            translate(width/2, height/2);
+        } 
+        switch(mode){
+            case 1: //stars on screen visual
+            {
+                for(int i = 0; i<stars.length;i++){ //Displays star(s) on screen
+                    fill(255);
+                    strokeWeight(1);
+                        
+                    float sx = map(stars[i].x/stars[i].z,0,1,0,width);
+                    float sy = map(stars[i].y/stars[i].z,0,1,0,height);
+                    float r = map(stars[i].z,0,width,16,0);
+                    ellipse(sx,sy,r,r);
+                    
+                    float px = map(stars[i].x/stars[i].pz,0,1,0,width);
+                    float py = map(stars[i].y/stars[i].pz,0,1,0,height);
+                    
+                    stroke(255);
+                    line(px,py,sx,sy);
+                }
+    
+                for(int i = 0;i<stars.length;i++){ //updates star(s) position on screen once they disappear
+                    stars[i].z = stars[i].z-25; //z - 25, 25 = speed of stars
+                    if(stars[i].z < 1){
+                        stars[i].z = width;
+                        stars[i].x = random(-width,width);
+                        stars[i].y = random(-height,height);
+                        stars[i].pz = stars[i].z;
+                    }
+                }
+                   
+            }
+
+            case 2:
+            
+            {
+                getFFT();
+                calculateFrequencyBands();
+                calculateAverageAmplitude();
+                getAmplitude();
+                float boxSize = 200 + (700 * getSmoothedAmplitude()); 
+                stroke(map(getSmoothedAmplitude(), 0, 1, 0, 255), 255, 255);
+                fill(10,10,10);
+                box(boxSize);
+            }
+
+           case 3:
+           {
+                if (key == '3') //if statement to make sure this visual is exclusive
+                {
+                
+                    t = (float) (pow(t,(float) 1.00001) + .1);
+                    calculateAverageAmplitude();
+                    stroke(map(getSmoothedAmplitude(), 0, 1, 0, 255), 255, 255);
+                    nprime++;
+                    translate(width/2,height/2);
+                    rotate(PI*sin(t/50));
+                    fill(255,30,50,30);
+                    rect(-width/2,-height/2,width,height);
+                    circles();
+                }
+            }
+
+            case 4:
+            {
+                if (key == '4') //if statement to make sure this visual is exclusive
+                {
+                    
+                getFFT();
+                getMinim();
+                calculateFrequencyBands();
+                calculateAverageAmplitude();
+                stroke(map(getSmoothedAmplitude(), 0, 1, 0, 255), 255, 255);
+                rot += getAmplitude() / 8.0f;
+                
+                translate(width / 2, height / 2, OFF_MAX);
+                rotateX((float) (frameCount * .01));
+                rotateY((float) (frameCount * .01));
+                rotateZ((float) (frameCount * .01));
+                
+                for (int xo = -OFF_MAX; xo <= OFF_MAX; xo += 50) {
+                    for (int yo = -OFF_MAX; yo <= OFF_MAX; yo += 50) {
+                        for (int zo = -OFF_MAX; zo <= OFF_MAX; zo += 50) {
+                            pushMatrix();
+                            translate(xo, yo, zo);
+                            rotateX((float) (frameCount * .02));
+                            rotateY((float) (frameCount * .02));
+                            rotateZ((float) (frameCount * .02));
+                            rotate(rot);
+                            fill(colorFromOffset(xo), colorFromOffset(yo), 
+                            colorFromOffset(zo));
+                            box((float) (20 + (Math.sin(frameCount / 20.0)) * 15));
+                            popMatrix();
+                        }
+                    }
+                }
+            }
+        }  
+    }
+        
+    }
+            
+    private void circles() {
+        calculateAverageAmplitude();
+        getFFT();
+        calculateFrequencyBands();//SEAN
+        for (int n = 1; n < nprime*3; n++) {
+            pushMatrix();
+            rot += getAmplitude() / 10.0f;
+            rotate(rot);
+            float r = c*sqrt(n);
+            float radius = 50;
+            float theta = n*PI*(3-sqrt(10));
+            stroke(map(getSmoothedAmplitude(), 0, 1, 0, 255), 255, 255);
+            fill(255,map(r/2,1,width,0,500),28,40);
+            float pulse = pow(sin(t*PI/3-n*PI/(t%100)),(float) 1.5);
+           
+            ellipse(r*cos(theta)/2,r*sin(theta)/2,pulse*radius+10,pulse*radius+6);
+            popMatrix();
+            pulse= 50 + (200 * getSmoothedAmplitude()); 
+        }
+            
+    }
+
+    int colorFromOffset(int offset) {
+        return (int) ((offset + OFF_MAX) / (2.0 * OFF_MAX) * 255);}
+}
+ 
\ No newline at end of file
diff --git a/java/src/c20474596/Star.java b/java/src/c20474596/Star.java
new file mode 100644
index 000000000..fbcf6e883
--- /dev/null
+++ b/java/src/c20474596/Star.java
@@ -0,0 +1,18 @@
+package c20474596;
+
+import processing.core.PApplet;
+
+public class Star extends PApplet {
+
+    float x;
+    float y;
+    float z;
+    float pz;  
+    public Star(){
+        x = random(-width,width);
+        y = random(-height,height);
+        z = random(width);
+        pz = z;
+    }
+
+}
\ No newline at end of file
diff --git a/java/src/c20474596/Visual.java b/java/src/c20474596/Visual.java
new file mode 100644
index 000000000..fdba202b4
--- /dev/null
+++ b/java/src/c20474596/Visual.java
@@ -0,0 +1,134 @@
+package c20474596;
+
+
+import processing.core.PApplet;
+import ddf.minim.*;
+import ddf.minim.analysis.FFT;
+
+public abstract class Visual extends PApplet
+{
+	private int frameSize = 512;
+	private int sampleRate = 44100;
+
+	protected float[] bands;
+	private float[] smoothedBands;
+
+	private Minim minim;
+	private AudioInput ai;
+	private AudioPlayer ap;
+	private AudioBuffer ab;
+	protected FFT fft;
+
+	private float amplitude  = 0;
+	private float smothedAmplitude = 0;
+
+	
+	
+	public void startMinim() 
+	{
+		minim = new Minim(this);
+
+		fft = new FFT(frameSize, sampleRate);
+
+		bands = new float[(int) log2(frameSize)];
+  		smoothedBands = new float[bands.length];
+
+	}
+	float log2(float f) {
+		return log(f) / log(2.0f);
+	}
+
+
+	
+	public void calculateAverageAmplitude()
+	{
+		float total = 0;
+		for(int i = 0 ; i < ab.size() ; i ++)
+        {
+			total += abs(ab.get(i));
+		}
+		amplitude = total / ab.size();
+		smothedAmplitude = PApplet.lerp(smothedAmplitude, amplitude, 0.1f);
+	}
+
+
+	protected void calculateFrequencyBands() {
+		for (int i = 0; i < bands.length; i++) {
+			int start = (int) pow(2, i) - 1;
+			int w = (int) pow(2, i);
+			int end = start + w;
+			float average = 0;
+			for (int j = start; j < end; j++) {
+				average += fft.getBand(j) * (j + 1);
+			}
+			average /= (float) w;
+			bands[i] = average * 5.0f;
+			smoothedBands[i] = lerp(smoothedBands[i], bands[i], 0.05f);
+		}
+	}
+
+	public void startListening()
+	{
+		ai = minim.getLineIn(Minim.MONO, frameSize, 44100, 16);
+		ab = ai.left;
+	}
+
+	public void loadAudio(String filename)
+	{
+		ap = minim.loadFile(filename, frameSize);
+		ab = ap.mix;
+	}
+
+	public int getFrameSize() {
+		return frameSize;
+	}
+
+	public void setFrameSize(int frameSize) {
+		this.frameSize = frameSize;
+	}
+
+	public int getSampleRate() {
+		return sampleRate;
+	}
+
+	public void setSampleRate(int sampleRate) {
+		this.sampleRate = sampleRate;
+	}
+
+	public float[] getBands() {
+		return bands;
+	}
+
+	public float[] getSmoothedBands() {
+		return smoothedBands;
+	}
+
+	public Minim getMinim() {
+		return minim;
+	}
+
+	public AudioInput getAudioInput() {
+		return ai;
+	}
+
+
+	public AudioBuffer getAudioBuffer() {
+		return ab;
+	}
+
+	public float getAmplitude() {
+		return amplitude;
+	}
+
+	public float getSmoothedAmplitude() {
+		return smothedAmplitude;
+	}
+
+	public AudioPlayer getAudioPlayer() {
+		return ap;
+	}
+
+	public FFT getFFT() {
+		return fft;
+	}
+}
diff --git a/java/src/c20474596/Warpdrive.java b/java/src/c20474596/Warpdrive.java
new file mode 100644
index 000000000..f9c34fc30
--- /dev/null
+++ b/java/src/c20474596/Warpdrive.java
@@ -0,0 +1,111 @@
+package c20474596;
+
+import ddf.minim.AudioBuffer;
+import ddf.minim.AudioInput;
+import ddf.minim.AudioPlayer;
+import ddf.minim.Minim;
+import processing.core.PApplet;
+
+public class Warpdrive extends Visual{
+
+
+    //Audio stuff
+    Minim minim;
+    AudioPlayer ap;
+    AudioInput ai;
+    AudioBuffer ab;
+
+
+    Star[] stars = new Star[1000]; //Star object array(1000 stars) case 1.
+
+    float angle = 0;
+    float px;
+    float py;
+    int mode = 0;
+    float smoothedBoxSize = 0;
+
+
+    public void keyPressed(){
+        if (key >= '0' && key <= '9') {
+			mode = key - '0';
+		}
+        if (key == ' ') {
+            getAudioPlayer().cue(0);
+            getAudioPlayer().play();
+        }
+    }
+
+    public void setup(){
+        for(int i = 0; i < stars.length; i++){
+            stars[i] = new Star();
+        }          
+        startMinim();
+        loadAudio("tevvez.mp3");
+        colorMode(HSB);
+        
+    }
+
+    public void settings(){
+        size(800,800,P3D);
+        fullScreen(P3D, SPAN);
+    }
+
+ 
+    public void draw(){
+        background(0);
+
+        switch(mode){
+        
+            case 1: //Star Wars warpdrive visual
+            {
+                translate(width/2, height/2);
+                for(int i = 0; i<stars.length;i++){ //Displays star(s) on your screen.
+                    fill(255);
+                    //noStroke();
+                    strokeWeight(1);
+                    float sx = map(stars[i].x/stars[i].z,0,1,0,width);
+                    float sy = map(stars[i].y/stars[i].z,0,1,0,height);
+                    float r = map(stars[i].z,0,width,16,0);
+                    ellipse(sx,sy,r,r);
+                
+                    float px = map(stars[i].x/stars[i].pz,0,1,0,width);
+                    float py = map(stars[i].y/stars[i].pz,0,1,0,height);
+                
+                    stroke(255);
+                    line(px,py,sx,sy);
+                }
+
+                for(int i = 0;i<stars.length;i++){ //updates star(s) position on screen once it disappears
+                    stars[i].z = stars[i].z-12;
+                    if(stars[i].z < 1){
+                        stars[i].z = width;
+                        stars[i].x = random(-width,width);
+                        stars[i].y = random(-height,height);
+                        stars[i].pz = stars[i].z;
+                    }
+                }
+
+            }
+
+            case 2: //Cube visual - MAKE CHANGES - EXAMPLE COPY.
+            {
+                calculateAverageAmplitude();
+                stroke(map(getSmoothedAmplitude(), 0, 1, 0, 255), 255, 255);
+                strokeWeight(5);
+                noFill();
+                lights();
+                pushMatrix();
+                camera(0, 0, 0, 0, 0, -1, 0, 1, 0);
+                translate(0, 0, -200);
+                rotateX(angle);
+                rotateZ(angle);       
+                float boxSize = 50 + (200 * getSmoothedAmplitude()); 
+                box(boxSize);   
+                popMatrix();
+                angle += 0.01f;
+            }
+        }
+        
+    }
+}
+ 
\ No newline at end of file
diff --git a/java/src/c20474596/drop.java b/java/src/c20474596/drop.java
new file mode 100644
index 000000000..163554e42
--- /dev/null
+++ b/java/src/c20474596/drop.java
@@ -0,0 +1,52 @@
+
+package c20474596;
+
+import processing.core.PApplet;
+
+public class drop extends PApplet{
+   
+    
+
+
+
+
+
+    float x = random(width);
+    float y = random(-500,-100);
+    float z= random(0,20);
+    float length =random(10,20);
+    float len = map(z,0,20,10,20);
+    float yspeed =map(z,0,20,1,20); 
+
+
+    void fall(){
+        y=y+yspeed;
+        float grav= map(Z,0,20,0.01,0.02);
+    
+        yspeed = yspeed +grav;
+
+        if (y>height){
+            y=random(-200,-100);
+            yspeed = map(z,0,20,4,10);
+        }
+    }
+    
+    void show(){
+
+    float thick= map(z,0,20,1,3); 
+    strokeWeight(thick);
+    stroke(138,43,226);
+    line(x,y,x,y+len);
+
+
+    }
+
+    
+    
+
+
+    private float map(int z2, int i, int j, double d, double e) {
+        return 0;
+    }
+
+}
\ No newline at end of file
diff --git a/java/src/example/AudioBandsVisual.java b/java/src/example/AudioBandsVisual.java
index b6b99d6e5..032bee559 100644
--- a/java/src/example/AudioBandsVisual.java
+++ b/java/src/example/AudioBandsVisual.java
@@ -7,9 +7,9 @@ public class AudioBandsVisual
 {
     MyVisual mv;
 
-    public AudioBandsVisual(MyVisual mv)
+    public AudioBandsVisual(c20474596.MyVisual myVisual)
     {
-        this.mv = mv; 
+        this.mv = myVisual; 
     }
 
     public void render()
diff --git a/java/src/example/CubeVisual1.java b/java/src/example/CubeVisual1.java
index 8eebd97f8..b4285505d 100644
--- a/java/src/example/CubeVisual1.java
+++ b/java/src/example/CubeVisual1.java
@@ -14,7 +14,7 @@ public void setup()
     {
         startMinim();
         //startListening();
-        loadAudio("heroplanet.mp3");
+        loadAudio("tevvez.mp3");
         colorMode(HSB);
     }
 
diff --git a/java/src/example/MyVisual.java b/java/src/example/MyVisual.java
index 849e71bc2..e4c1dbca1 100644
--- a/java/src/example/MyVisual.java
+++ b/java/src/example/MyVisual.java
@@ -23,11 +23,11 @@ public void setup()
         startMinim();
                 
         // Call loadAudio to load an audio file to process 
-        //loadAudio("heroplanet.mp3");   
+        loadAudio("tevvez.mp3");   
 
         
         // Call this instead to read audio from the microphone
-        startListening(); 
+        //startListening(); 
         
         wf = new WaveForm(this);
         abv = new AudioBandsVisual(this);
diff --git a/java/src/example/RotatingAudioBands.java b/java/src/example/RotatingAudioBands.java
index 72fd7a223..d49ca8443 100644
--- a/java/src/example/RotatingAudioBands.java
+++ b/java/src/example/RotatingAudioBands.java
@@ -32,7 +32,7 @@ public void setup()
         setFrameSize(256);
 
         startMinim();
-        loadAudio("heroplanet.mp3");
+        loadAudio("tevvez.mp3");
         getAudioPlayer().play();
         //startListening(); 
         
diff --git a/java/src/example/WaveForm.java b/java/src/example/WaveForm.java
index 5d38aa700..64a348804 100644
--- a/java/src/example/WaveForm.java
+++ b/java/src/example/WaveForm.java
@@ -8,9 +8,9 @@ public class WaveForm
     MyVisual mv;
     float cy = 0;
 
-    public WaveForm(MyVisual mv)
+    public WaveForm(c20474596.MyVisual myVisual)
     {
-        this.mv = mv;
+        this.mv = myVisual;
         cy = this.mv.height / 2;
     }
 
diff --git a/java/src/ie/tudublin/Main.java b/java/src/ie/tudublin/Main.java
index 27489f824..299b91533 100644
--- a/java/src/ie/tudublin/Main.java
+++ b/java/src/ie/tudublin/Main.java
@@ -1,6 +1,7 @@
 package ie.tudublin;
 
 import example.CubeVisual;
+import example.CubeVisual1;
 import example.MyVisual;
 import example.RotatingAudioBands;
 
@@ -10,7 +11,7 @@ public class Main
 	public void startUI()
 	{
 		String[] a = {"MAIN"};
-        processing.core.PApplet.runSketch( a, new MyVisual());		
+        processing.core.PApplet.runSketch( a, new RotatingAudioBands());		
 	}
 
 	public static void main(String[] args)
diff --git a/java/src/ie/tudublin/Visual.java b/java/src/ie/tudublin/Visual.java
index 927fe57b1..8bd379a63 100644
--- a/java/src/ie/tudublin/Visual.java
+++ b/java/src/ie/tudublin/Visual.java
@@ -22,6 +22,8 @@ public abstract class Visual extends PApplet
 	private float smothedAmplitude = 0;
 
 	
+
+	
 	
 	public void startMinim() 
 	{