diff --git a/src/main.c b/src/main.c
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,7 @@
 //
 // Therm Firmware
 // Copyright 2018 Ethan Zonca
-// Author(s): Ethan Zonca
+// Author(s): Ethan Zonca and Matthew Reed
 //
 
 #include "stm32f3xx_hal.h"
@@ -24,6 +24,7 @@ int main(void)
     sysclock_init();
     hal_init();
     gpio_init();
+    flash_init();
 
     ssd1306_init();
 
@@ -31,14 +32,22 @@ int main(void)
     display_startup_screen();
     HAL_Delay(2000);
     ssd1306_clearscreen();
-    ssd1306_drawlogo();
+    //ssd1306_drawlogo();
 
     // Default status
     runtime_status()->temp = 0.0;
     runtime_status()->state_resume = 0;
-    runtime_status()->state = STATE_IDLE;
     runtime_status()->setpoint = 70;
     runtime_status()->pid_enabled = 0;
+    runtime_status()->setpoint_index = 0;
+    if (flash_getsettings()->val.boottobrew)
+    {
+        runtime_status()->state = STATE_PREHEAT;
+    }
+    else
+    {
+        runtime_status()->state = STATE_IDLE;
+    }
 
     pid_init();
     pwmout_init();