 
 #define LEFT_GUTTER_SIZE    (FONT_X)
 #define FONT_SIZE           (1)
-#define LINE_SPACING        (FONT_SIZE*FONT_Y+4)
+#define LINE_HEIGHT         (FONT_SIZE*FONT_Y+4)
 
-SSD1331 oled = SSD1331(cs, dc, mosi, sclk);  
+SSD1331 oled = SSD1331(cs, dc, mosi, sclk);
 
 char *test_menu[] = {"hello", "world", "here be", "dragons", NULL};
 
 char _sbuf[64];
 char _sbuf2[64];
 
-uint8_t logbat = 0;
-uint16_t eeaddr = 1;
-
 uint16_t now = 0;
 uint16_t checkpoint;
-
 
 typedef enum {
   SCREEN_WATCH,
   SCREEN_STATUS,
+  SCREEN_OTHER,
 } Screen;
 
 Screen currentScreen;


    case SCREEN_WATCH:
      watch_show(changes);
      break; 
  }

  if (changes >= 2 && logbat) {
    if (eeaddr < 1024) {
      uint8_t batvol = Xadow.getBatVol()*10;
      EEPROM[eeaddr] = batvol;
      eeaddr += 1;
    }
  }

  uint16_t t = millis();


  power_spi_enable();
  uint8_t changes = watch_tick(now);

  batlog_tick(changes);

  Screen nextscreen = currentScreen;

