#include "vg/vg_tex.h"
 #include "vg/vg_input.h"
 #include "vg/vg_ui.h"
-#include "vg/vg_debug.h"
 #include "vg/vg_console.h"
+#include "vg/vg_debug.h"
 
 #include "steam/steamworks_thin.h"
 
        
                vg_audio_init();
                vg_register_exit( &vg_audio_free, "vg_audio_free" );
-       
+               
+               vg_debugtools_setup();
+               
                // Main gameloop
                while( !glfwWindowShouldClose( vg_window ) )
                {
                                
                                vg_ui();
                                vg_console_draw();
+                               vg_debugtools_draw();
                                
                                ui_resolve( &ui_global_ctx );
                                m3x3f view = M3X3_IDENTITY;
 
-int sfx_debug = 0;
+int debug_sfx = 0;
+
+struct vg_convar debug_cvars[] =
+{
+       { .name = "debug_sfx", .data = &debug_sfx, .data_type = k_convar_dtype_i32 }
+};
 
 static void sfx_internal_debug_overlay(void)
 {
-       if( !sfx_debug ) return;
+       if( !debug_sfx ) 
+               return;
 
        // Grab values
        struct sound_info
                ui_global_ctx.cursor[1] += 1;
        }
 }
+
+static void vg_debugtools_draw(void)
+{
+       sfx_internal_debug_overlay();
+}
+
+static void vg_debugtools_setup(void)
+{
+       for( int i = 0; i < vg_list_size( debug_cvars ); i ++ )
+       {
+               vg_convar_push( debug_cvars[i] );
+       }
+}