diff --git a/src/main/java/seng302/visualiser/GameView.java b/src/main/java/seng302/visualiser/GameView.java
index c407fd6f..4ae8f18d 100644
--- a/src/main/java/seng302/visualiser/GameView.java
+++ b/src/main/java/seng302/visualiser/GameView.java
@@ -13,7 +13,6 @@ import javafx.animation.Timeline;
 import javafx.application.Platform;
 import javafx.collections.ObservableList;
 import javafx.geometry.Point2D;
-import javafx.geometry.Point3D;
 import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.image.ImageView;
@@ -23,12 +22,9 @@ import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
-import javafx.scene.paint.PhongMaterial;
 import javafx.scene.shape.Circle;
-import javafx.scene.shape.Cylinder;
 import javafx.scene.shape.Polygon;
 import javafx.scene.text.Text;
-import javafx.scene.transform.Rotate;
 import javafx.util.Duration;
 import seng302.gameServer.messages.RoundingSide;
 import seng302.model.ClientYacht;
@@ -45,6 +41,7 @@ import seng302.visualiser.fxObjects.CourseBoundary;
 import seng302.visualiser.fxObjects.Gate;
 import seng302.visualiser.fxObjects.MarkArrowFactory;
 import seng302.visualiser.fxObjects.Marker;
+import seng302.visualiser.fxObjects.VelocityPickup;
 import seng302.visualiser.map.Boundary;
 import seng302.visualiser.map.CanvasMap;
 
@@ -87,7 +84,7 @@ public class GameView extends Pane {
     private Group markers = new Group();
     private Group tokens = new Group();
     private List<CompoundMark> course = new ArrayList<>();
-    private List<Cylinder> mapTokens;
+    private List<Node> mapTokens;
 
     private ImageView mapImage = new ImageView();
 
@@ -187,9 +184,9 @@ public class GameView extends Pane {
                     }
                 }
                 boatObjects.forEach((boat, boatObject) -> boatObject.updateLocation());
-                for (Cylinder c : mapTokens) {
-                    c.getTransforms().add(new Rotate(1, new Point3D(45, 45, 45)));
-                }
+//                for (Cylinder c : mapTokens) {
+//                    c.getTransforms().add(new Rotate(1, new Point3D(45, 45, 45)));
+//                }
             }
         };
     }
@@ -461,11 +458,11 @@ public class GameView extends Pane {
         mapTokens = new ArrayList<>();
         for (Token token : newTokens) {
             Point2D location = findScaledXY(token.getLat(), token.getLng());
-            Cylinder tokenObject = new Cylinder(10, 10);
-            tokenObject.getTransforms().add(new Rotate(45, new Point3D(45, 45, 45)));
+            Node tokenObject = new VelocityPickup();
+//            tokenObject.getTransforms().add(new Rotate(45, new Point3D(45, 45, 45)));
             tokenObject.setLayoutX(location.getX());
             tokenObject.setLayoutY(location.getY());
-            tokenObject.setMaterial(new PhongMaterial(Color.YELLOW));
+//            tokenObject.setMaterial(new PhongMaterial(Color.YELLOW));
             mapTokens.add(tokenObject);
         }
 
diff --git a/src/main/java/seng302/visualiser/fxObjects/VelocityPickup.java b/src/main/java/seng302/visualiser/fxObjects/VelocityPickup.java
new file mode 100644
index 00000000..24d2d78a
--- /dev/null
+++ b/src/main/java/seng302/visualiser/fxObjects/VelocityPickup.java
@@ -0,0 +1,38 @@
+package seng302.visualiser.fxObjects;
+
+import com.interactivemesh.jfx.importer.stl.StlMeshImporter;
+import javafx.animation.AnimationTimer;
+import javafx.application.Platform;
+import javafx.geometry.Point3D;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.PhongMaterial;
+import javafx.scene.shape.MeshView;
+import javafx.scene.transform.Rotate;
+import javafx.scene.transform.Scale;
+
+/**
+ * Created by cir27 on 3/09/17.
+ */
+public class VelocityPickup extends MeshView {
+
+    public double rotation = 0;
+    public Rotate timerRotation = new Rotate(0, new Point3D(0,0,1));
+
+    public VelocityPickup () {
+        StlMeshImporter importer = new StlMeshImporter();
+        importer.read(getClass().getResource("/velocity_pickup.stl").toString());
+        this.setMesh(importer.getImport());
+        this.setMaterial(new PhongMaterial(Color.YELLOW));
+        this.getTransforms().add(new Scale(30,30,30));
+        this.getTransforms().add(new Rotate(30, new Point3D(1,0, 0)));
+        this.getTransforms().add(new Rotate(90, new Point3D(0,1, 0)));
+        this.getTransforms().add(timerRotation);
+        AnimationTimer at = new AnimationTimer() {
+            @Override
+            public void handle(long now) {
+                Platform.runLater(() -> timerRotation.setAngle(rotation++));
+            }
+        };
+        at.start();
+    }
+}
diff --git a/src/main/resources/velocity_pickup.stl b/src/main/resources/velocity_pickup.stl
new file mode 100644
index 00000000..040d48cf
Binary files /dev/null and b/src/main/resources/velocity_pickup.stl differ
diff --git a/src/main/resources/velocity_pickup_2manyP.stl b/src/main/resources/velocity_pickup_2manyP.stl
new file mode 100644
index 00000000..d00f818d
Binary files /dev/null and b/src/main/resources/velocity_pickup_2manyP.stl differ