Index: new-game.cpp
===================================================================
--- new-game.cpp	(revision de53394295d2f6a87aace959a1087e3698726487)
+++ new-game.cpp	(revision b05e2b5ec11655ffea5bb44d8a3911f6adc3c15d)
@@ -200,6 +200,4 @@
                   GLuint* texcoords_vbo,
                   GLuint* normals_vbo,
-                  GLuint* time_vbo,
-                  GLuint* velocity_vbo,
                   GLuint* ubo,
                   GLuint* model_mat_idx_vbo);
@@ -212,6 +210,4 @@
                   GLuint texcoords_vbo,
                   GLuint normals_vbo,
-                  GLuint time_vbo,
-                  GLuint velocity_vbo,
                   GLuint ubo,
                   GLuint model_mat_idx_vbo);
@@ -491,6 +487,4 @@
     texcoords_vbo,
     normals_vbo,
-    time_vbo,
-    velocity_vbo,
     ubo,
     model_mat_idx_vbo;
@@ -501,6 +495,4 @@
       &texcoords_vbo,
       &normals_vbo,
-      &time_vbo,
-      &velocity_vbo,
       &ubo,
       &model_mat_idx_vbo);
@@ -635,13 +627,6 @@
    defineModelGroupUniform(modelGroups[TYPE_EXPLOSION], "proj", ATTRIB_UNIFORM,
       1, UNIFORM_MATRIX_4F, value_ptr(proj_mat));
-   // Still need to do the model mat
-
-  initModelGroupAttribs(modelGroups[TYPE_EXPLOSION]);
-
-   glBindBuffer(GL_ARRAY_BUFFER, velocity_vbo);
-   glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, NULL);
-
-   glBindBuffer(GL_ARRAY_BUFFER, time_vbo);
-   glVertexAttribPointer(1, 1, GL_FLOAT, GL_FALSE, 0, NULL);
+
+   initModelGroupAttribs(modelGroups[TYPE_EXPLOSION]);
 
    cam_pos = vec3(0.0f, 0.0f, 2.0f);
@@ -703,6 +688,4 @@
       texcoords_vbo,
       normals_vbo,
-      time_vbo,
-      velocity_vbo,
       ubo,
       model_mat_idx_vbo);
@@ -2137,6 +2120,4 @@
                   GLuint* texcoords_vbo,
                   GLuint* normals_vbo,
-                  GLuint* time_vbo,
-                  GLuint* velocity_vbo,
                   GLuint* ubo,
                   GLuint* model_mat_idx_vbo) {
@@ -2152,10 +2133,4 @@
    *normals_vbo = 0;
    glGenBuffers(1, normals_vbo);
-
-   *velocity_vbo = 0;
-   glGenBuffers(1, velocity_vbo);
-
-   *time_vbo = 0;
-   glGenBuffers(1, time_vbo);
 
    *ubo = 0;
@@ -2173,6 +2148,4 @@
                   GLuint texcoords_vbo,
                   GLuint normals_vbo,
-                  GLuint time_vbo,
-                  GLuint velocity_vbo,
                   GLuint ubo,
                   GLuint model_mat_idx_vbo) {
@@ -2204,8 +2177,8 @@
    // to move this code out of here
 
-   glBindBuffer(GL_ARRAY_BUFFER, velocity_vbo);
+   glBindBuffer(GL_ARRAY_BUFFER, modelGroups[TYPE_EXPLOSION].attribs["v_i"].buffer);
    glBufferData(GL_ARRAY_BUFFER, sizeof(vv), vv, GL_STATIC_DRAW);
 
-   glBindBuffer(GL_ARRAY_BUFFER, time_vbo);
+   glBindBuffer(GL_ARRAY_BUFFER, modelGroups[TYPE_EXPLOSION].attribs["start_time"].buffer);
    glBufferData(GL_ARRAY_BUFFER, sizeof(vt), vt, GL_STATIC_DRAW);