diff --git a/include/vieter_job_queue.h b/include/vieter_job_queue.h
index 6c21da0..bc2f5e5 100644
--- a/include/vieter_job_queue.h
+++ b/include/vieter_job_queue.h
@@ -12,9 +12,9 @@
  * other things.
  */
 typedef enum vieter_job_state {
-    vieter_job_queued = 0,
-    vieter_job_dispatched = 1,
-    vieter_job_finished = 2
+    vieter_job_state_queued = 0,
+    vieter_job_state_ready = 1,
+    vieter_job_state_build_finished = 2
 } vieter_job_state;
 
 // This macro should be kept in sync with the above enum
@@ -27,6 +27,14 @@ typedef struct vieter_job {
     bool single;
     vieter_job_state state;
     uint64_t state_transition_times[VIETER_JOB_STATES];
+    bool dispatched;
+    void *build_config;
 } vieter_job;
 
+typedef struct vieter_job_queue vieter_job_queue;
+
+vieter_job_queue *vieter_job_queue_init();
+
+void vieter_job_queue_insert(int id);
+
 #endif
diff --git a/src/job-queue/vieter_job_queue_internal.h b/src/job-queue/vieter_job_queue_internal.h
new file mode 100644
index 0000000..cbad8f8
--- /dev/null
+++ b/src/job-queue/vieter_job_queue_internal.h
@@ -0,0 +1,11 @@
+#ifndef VIETER_JOB_QUEUE_INTERNAL
+#define VIETER_JOB_QUEUE_INTERNAL
+
+#include "vieter_tree.h"
+
+struct vieter_job_queue {
+    vieter_tree *tree;
+
+};
+
+#endif