diff --git a/docs/tulip_api.md b/docs/tulip_api.md
index dcb206cdc..0fc7ad068 100644
--- a/docs/tulip_api.md
+++ b/docs/tulip_api.md
@@ -113,11 +113,11 @@ Tulip ships with a text editor, based on pico/nano. It supports syntax highlight
 
 ```python
 # Opens the Tulip editor to the given filename. 
-# Control-X exits and prompts to save if any changes. 
-# Control-O is save as
+# Control-X saves the file, if no filename give will prompt for one. 
+# Control-O is save as -- will write to new filename given
 # Control-W searches
-# Filename will be created on save if it doesn't exist.
 edit("game.py")
+edit() # no filename
 ```
 
 
diff --git a/tulip/esp32s3/tasks.h b/tulip/esp32s3/tasks.h
index cea83dd06..b34bd0242 100644
--- a/tulip/esp32s3/tasks.h
+++ b/tulip/esp32s3/tasks.h
@@ -42,7 +42,7 @@
 #define ALLES_RENDER_TASK_STACK_SIZE (8 * 1024)
 #define ALLES_FILL_BUFFER_TASK_STACK_SIZE (8 * 1024)
 
-#define MP_TASK_HEAP_SIZE (2 * 1024 * 1024)
+#define MP_TASK_HEAP_SIZE (3 * 1024 * 1024)
 
 #define DISPLAY_TASK_NAME           "display_task"
 #define USB_TASK_NAME               "usb_task"
diff --git a/tulip/shared/editor.c b/tulip/shared/editor.c
index 2691a6f2e..aca49afd4 100644
--- a/tulip/shared/editor.c
+++ b/tulip/shared/editor.c
@@ -41,12 +41,22 @@ uint8_t quit_flag = 0;
 uint16_t y_offset = 0;
 uint16_t cursor_x = 0;
 uint16_t cursor_y = 0;
+#define EDITOR_NORMAL 0
+#define EDITOR_PROMPT_CHAR 1
+#define EDITOR_PROMPT_SEARCH 2
+#define EDITOR_PROMPT_SAVE 3
+#define EDITOR_PROMPT_READ 3
+#define MAX_STRING_LEN 50 // for search string, filenames
 #define EDITOR_TAB_SPACES 4
 #define V_SCROLL_MARGIN 6
-#define MAX_STRING_LEN 50 // for search string, filenames
-char fn[MAX_STRING_LEN]; 
-char last_search[MAX_STRING_LEN];
 
+char prompted_string[MAX_STRING_LEN];
+char current_prompt[MAX_STRING_LEN];
+uint8_t prompted_count = 0;
+uint8_t editor_mode = EDITOR_NORMAL;
+char fn[MAX_STRING_LEN]; 
+int mc=0;
+int fc=0;
 
 void dbg(const char *fmt, ...) {
     va_list args;
@@ -55,8 +65,7 @@ void dbg(const char *fmt, ...) {
     va_end(args);
 }
 
-int mc=0;
-int fc=0;
+
 void * editor_malloc(uint32_t size) {
     mc++;
 	return malloc_caps(size, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
@@ -157,7 +166,6 @@ void string_at_row(char * s, int16_t len, uint16_t y) {
 // (Re) paints the entire TFB
 void paint_tfb(uint16_t start_at_y) {
     for(uint16_t y=start_at_y;y<TFB_ROWS-1;y++) {
-        //delay_ms(1); // this helps Tulip not lose sync of the screen
         if(y_offset + y < lines) { 
 	       string_at_row(text_lines[y_offset+y], -1, y);
         } else {
@@ -213,11 +221,13 @@ void move_cursor(int16_t x, int16_t y) {
 	char status[TFB_COLS];
 	// TODO, padding better 
 	float percent = ((float)(cursor_y+y_offset+1) / (float)lines) * 100.0;
+    char dirty_char = ' ';
+    if(dirty) dirty_char = '*';
     #ifdef TDECK
     // Smaller screen, less space for text
-	sprintf(status, "%04d / %04d [%02.2f%%] %3d %.10s", cursor_y+y_offset+1, lines,  percent, cursor_x, fn);
+	sprintf(status, "%04d / %04d [%02.2f%%] %3d %.10s %c", cursor_y+y_offset+1, lines,  percent, cursor_x, fn, dirty_char);
     #else
-    sprintf(status, "%04d / %04d [%02.2f%%] %3d %.35s", cursor_y+y_offset+1, lines,  percent, cursor_x, fn);
+    sprintf(status, "%04d / %04d [%02.2f%%] %3d %.35s %c", cursor_y+y_offset+1, lines,  percent, cursor_x, fn, dirty_char);
     #endif    
 	string_at_row(status, strlen(status), TFB_ROWS-1);
 	format_at_row(FORMAT_INVERSE, -1, TFB_ROWS-1);
@@ -361,43 +371,15 @@ void editor_open_file(const char *filename) {
 	paint_tfb(0);
 }
 
-int8_t prompt_for_char(char * prompt) {
+void prompt_for_string(char * prompt,  uint8_t mode) {
+    prompted_count = 0;
+    prompted_string[0] = 0;
+    strcpy(current_prompt, prompt);
     string_at_row(prompt, -1, TFB_ROWS-1);
     format_at_row(FORMAT_INVERSE, -1, TFB_ROWS-1);
     paint_tfb(TFB_ROWS-1);
-
-    return mp_hal_stdin_rx_chr();
-}
-
-void prompt_for_string(char * prompt, char * default_answer, char * output_string) {
-    char *expanded_prompt;
-    if(strlen(default_answer)) {
-        expanded_prompt = editor_malloc(strlen(prompt) + strlen(default_answer) + 4);
-        sprintf(expanded_prompt, "%s [%s]:", prompt, default_answer);
-    } else {
-        expanded_prompt = editor_malloc(strlen(prompt)+1);
-        sprintf(expanded_prompt, "%s:", prompt);        
-    }
-    string_at_row(expanded_prompt, -1, TFB_ROWS-1);
-    format_at_row(FORMAT_INVERSE, -1, TFB_ROWS-1);
-    int c = -1;
-    uint8_t i = 0;
-    c = mp_hal_stdin_rx_chr();
-    while(c!=13 && c!=10) {
-        output_string[i++] = c;
-        TFB[(TFB_ROWS-1)*TFB_COLS+i+strlen(expanded_prompt)] = c;
-        paint_tfb(TFB_ROWS-1);
-        c = mp_hal_stdin_rx_chr();
-    }
-    output_string[i] = 0;
-
-    if(i == 0) {
-        if(strlen(default_answer)) {
-            strcpy(output_string, default_answer);
-        }
-    } 
-    move_cursor(cursor_x, cursor_y);
-    editor_free(expanded_prompt);
+    display_tfb_update(TFB_ROWS-1);
+    editor_mode=mode;
 }
 
 
@@ -418,37 +400,13 @@ void editor_save() {
         //display_start();
         dirty = 0;
         editor_free(text);
+        dbg("Saved %s\n", fn);
+        move_cursor(cursor_x, cursor_y);
     } else {
-        //dbg("No filename given, not saving\n");
+        dbg("No filename given, not saving\n");
     }
 }
 
-void editor_quit() {
-	quit_flag = 0;
-	if(dirty) {
-        if(strlen(fn)==0) {
-            prompt_for_string("Save as", "", fn);
-            editor_save(); // if no fn give, will skip
-        } else {
-            int8_t c = 0;
-            while(c != 'Y' && c != 'y' && c != 'N' && c != 'n') {
-                c = prompt_for_char("Save file? [Y/N]");
-            }
-            if(c=='Y' || c=='y') {
-    	    	editor_save();
-            }
-        }
-	}
-	restore_tfb();
-	for(uint16_t i=0;i<lines;i++) {
-        //delay_ms(1);
-		editor_free(text_lines[i]);
-	}
-	editor_free(text_lines);
-	if(yank) editor_free(yank);
-    yank = 0;
-    if(mc != fc) dbg("mc %d fc %d\n", mc, fc);
-}
 
 
 void editor_insert_character(int c) {
@@ -718,11 +676,8 @@ void editor_unyank() {
 }
 
 
-void editor_search() {
-    char search_string[MAX_STRING_LEN];
-    prompt_for_string("Search string", last_search, search_string);
+void editor_search(char * search_string) {
     if(strlen(search_string)) {
-        strcpy(last_search, search_string);
         uint8_t found = 0;
         //dbg("starting search on line %d\n", y_offset + cursor_y);
         for(uint16_t i=y_offset+cursor_y;i<lines+y_offset+cursor_y;i++) {
@@ -769,111 +724,131 @@ void editor_search() {
     
 }
 
-void editor_save_as() {
-    char save_as_fn[MAX_STRING_LEN];
-    prompt_for_string("Save as", fn, save_as_fn);
-    strcpy(fn, save_as_fn);
-    // save the file now
-    editor_save();
-    // Update the status
-    move_cursor(cursor_x, cursor_y);
-}
-
-void editor_read_into() {
-    char read_into_fn[MAX_STRING_LEN];
-    dirty=1;
-    prompt_for_string("Read file into buffer", "", read_into_fn);
-    //dbg("I got fn of %s\n", read_into_fn);
-    if(file_exists(read_into_fn)) {
-        // now run open_file
-        editor_open_file(read_into_fn);
+
+void process_char(int c) {
+    if(editor_mode == EDITOR_PROMPT_SEARCH || editor_mode == EDITOR_PROMPT_SAVE || editor_mode == EDITOR_PROMPT_READ) {
+        if(c>31 && c<127) {
+            prompted_string[prompted_count++] = c;
+            TFB[(TFB_ROWS-1)*TFB_COLS+prompted_count+strlen(current_prompt)] = c;
+            paint_tfb(TFB_ROWS-1);
+            display_tfb_update(TFB_ROWS-1);
+        }
+        if(c==3) {
+            editor_mode=EDITOR_NORMAL;
+            move_cursor(cursor_x,cursor_y);
+        }
+        if(c==127 || c==8) {
+            if(prompted_count>0) {
+                prompted_string[prompted_count] = 0;
+                TFB[(TFB_ROWS-1)*TFB_COLS+prompted_count+strlen(current_prompt)] = ' ';
+                prompted_count--; // now pc is 4
+                paint_tfb(TFB_ROWS-1);
+                display_tfb_update(TFB_ROWS-1);
+            }
+        }
+        if(c==13 || c == 10) {
+            prompted_string[prompted_count] = 0;
+            if(strlen(prompted_string)==0) {
+                dbg("no text entered\n");
+            } else {
+                dbg("str %s\n", prompted_string); 
+                if(editor_mode == EDITOR_PROMPT_SAVE) {
+                    strcpy(fn, prompted_string);
+                    editor_save();
+                } else if(editor_mode==EDITOR_PROMPT_READ) {
+                    if(file_exists(prompted_string)) {
+                        editor_open_file(prompted_string);
+                    } else {
+                        dbg("no such file %s\n", prompted_string);
+                    }
+                } else if(editor_mode==EDITOR_PROMPT_SEARCH) {
+                    editor_search(prompted_string);
+                }
+            }
+            editor_mode = EDITOR_NORMAL;
+            move_cursor(cursor_x,cursor_y);
+        } 
     } else {
-        //dbg("no such file %s\n", read_into_fn);
+    	//dbg("Got char %d\n", c);
+    	if(c==127 || c==8) { // backspace
+    		editor_backspace();
+    	} else if(c == 9) { // tab, control-I
+    		editor_tab();
+    	} else if(c==10 || c == 13) { // CRLF
+    		editor_crlf();
+    	} else if(c == 3) {  // control-C 
+            // we should trap this and ... what?
+    	} else if(c ==11) { // control-K, yank
+    		editor_yank();
+    	} else if(c== 21) { // control-U, unyank
+    		editor_unyank();
+    	} else if(c==15) { // control-O, save as 
+            prompt_for_string("Save as: ", EDITOR_PROMPT_SAVE);
+        } else if(c==18) { // control-R, read into
+            prompt_for_string("Read file: ",EDITOR_PROMPT_READ);
+    	} else if(c==23) { // control-W, "where is" aka search TODO 
+            prompt_for_string("Search string: ", EDITOR_PROMPT_SEARCH);
+    	} else if(c==24) { // control-X, save (no ask)
+            if(strlen(fn)>0) {
+                editor_save();
+            } else {
+                prompt_for_string("Save as: ", EDITOR_PROMPT_SAVE);
+            }
+    	} else if(c == 1) { // control-A, start of line
+    		editor_linestart();
+    	} else if(c == 5) { // control-E, end of line
+    		editor_lineend();
+    	} else if(c==25) { // control Y, page up
+    		editor_page_up();
+    	} else if(c==22) { // control V, page down 
+    		editor_page_down();
+    	} else if(c==27) { // ansi code, up / down / left / right / forward delete
+    		char s = (char) mp_hal_stdin_rx_chr(); // Skip the [
+    		s = (char)mp_hal_stdin_rx_chr(); // Get the code
+    		if(s == 'D') { //left 
+    			editor_left();
+    		} else if(s=='C') { // right
+    			editor_right();
+    		} else if(s=='B') { // down
+    			editor_down();
+    		} else if(s=='A') { // up
+    			editor_up();
+    		} else if(s=='3') { // forward delete
+    			s = (char)mp_hal_stdin_rx_chr(); // skip the ~
+    			// AFAIK this is what forward delete is
+    			editor_right();
+    			editor_backspace();
+    		}
+    	// local mode high bit arrows & forward delete 
+    	} else if(c == 259) { editor_up(); 
+    	} else if(c == 258) { editor_down(); 
+    	} else if(c == 260) { editor_left(); 
+    	} else if(c == 261) { editor_right(); 
+    	} else if(c == 330) { editor_right(); editor_backspace(); 
+    	} else if(c>31 && c<127) {
+    		editor_insert_character(c);
+    	} else {
+    		// Ignore unsupported keycodes...
+    	}
     }
-
 }
 
 
-
-
-void process_char(int c) {
-	//dbg("Got char %d\n", c);
-	if(c==127 || c==8) { // backspace
-		editor_backspace();
-	} else if(c == 9) { // tab, control-I
-		editor_tab();
-	} else if(c==10 || c == 13) { // CRLF
-		editor_crlf();
-	} else if(c == 3) {  // control-C 
-        // we should trap this and ... what?
-	} else if(c ==11) { // control-K, yank
-		editor_yank();
-	} else if(c== 21) { // control-U, unyank
-		editor_unyank();
-	} else if(c==15) { // control-O, save as 
-        //dbg("save-as\n");
-		editor_save_as();
-    } else if(c==18) { // control-R, read into
-        editor_read_into();
-	} else if(c==23) { // control-W, "where is" aka search TODO 
-        editor_search();
-	} else if(c==24) { // control-X, quit 
-		quit_flag = 1;
-	} else if(c == 1) { // control-A, start of line
-		editor_linestart();
-	} else if(c == 5) { // control-E, end of line
-		editor_lineend();
-	} else if(c==25) { // control Y, page up
-		editor_page_up();
-	} else if(c==22) { // control V, page down 
-		editor_page_down();
-	} else if(c==27) { // ansi code, up / down / left / right / forward delete
-		char s = (char) mp_hal_stdin_rx_chr(); // Skip the [
-		s = (char)mp_hal_stdin_rx_chr(); // Get the code
-		if(s == 'D') { //left 
-			editor_left();
-		} else if(s=='C') { // right
-			editor_right();
-		} else if(s=='B') { // down
-			editor_down();
-		} else if(s=='A') { // up
-			editor_up();
-		} else if(s=='3') { // forward delete
-			s = (char)mp_hal_stdin_rx_chr(); // skip the ~
-			// AFAIK this is what forward delete is
-			editor_right();
-			editor_backspace();
-		}
-	// local mode high bit arrows & forward delete 
-	} else if(c == 259) { editor_up(); 
-	} else if(c == 258) { editor_down(); 
-	} else if(c == 260) { editor_left(); 
-	} else if(c == 261) { editor_right(); 
-	} else if(c == 330) { editor_right(); editor_backspace(); 
-	} else if(c>31 && c<127) {
-		editor_insert_character(c);
-	} else {
-		// Ignore unsupported keycodes...
-	}
-}
-
-void editor_init() {
+void editor_start(const char * filename) {
+    mc = 0; 
+    fc = 0;
+    prompted_string[0] = 0;
+    current_prompt[0] = 0;
+    prompted_count = 0;
+    editor_mode = EDITOR_NORMAL;
     lines =0;
     dirty = 0;
     y_offset = 0;
     cursor_y = 0;
     cursor_x = 0;
-    last_search[0] = 0;
     fn[0] = 0;
-}
-
 
-
-void editor(const char * filename) {
-    mc = 0; fc = 0;
-	save_tfb();
-    editor_init();
-	if(filename != NULL) { 
+    if(filename != NULL) { 
         strcpy(fn, filename);
 		dbg("editor fn is %s\n", fn);
 		editor_open_file(fn);
@@ -885,16 +860,28 @@ void editor(const char * filename) {
 	}
 	move_cursor(0,0);
 	y_offset = 0;
-    while(quit_flag == 0) {
-#ifdef ESP_PLATFORM
-		vPortYield();
-#endif
-		int c = mp_hal_stdin_rx_chr();
-		if(c>=0) {
-			process_char(c);
-		}
-	}	
-	editor_quit();
+}
+
+void editor_key(int c) {
+	process_char(c);
+}
+
+// stuff is still in RAM, just redraw
+void editor_activate() {
+    paint_tfb(0);
+    move_cursor(cursor_x,cursor_y);
+}
+
+void editor_deinit() {
+    //restore_tfb();
+    for(uint16_t i=0;i<lines;i++) {
+        //delay_ms(1);
+        editor_free(text_lines[i]);
+    }
+    editor_free(text_lines);
+    if(yank) editor_free(yank);
+    yank = 0;
+    if(mc != fc) dbg("mc %d fc %d\n", mc, fc);
 }
 
 
diff --git a/tulip/shared/modtulip.c b/tulip/shared/modtulip.c
index a9d05b935..5e499ee22 100644
--- a/tulip/shared/modtulip.c
+++ b/tulip/shared/modtulip.c
@@ -475,6 +475,8 @@ mp_obj_t frame_arg = NULL;
 mp_obj_t touch_callback = NULL; 
 mp_obj_t keyboard_callback = NULL;
 
+
+
 STATIC mp_obj_t mp_lv_task_handler(mp_obj_t arg)
 {  
     lv_task_handler();
@@ -552,8 +554,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(tulip_midi_remove_callbacks_obj, 0, 0
 
 
 
-
-
 STATIC mp_obj_t tulip_defer(size_t n_args, const mp_obj_t *args) {
     int8_t index = -1;
     for(uint8_t slot=0;slot<DEFER_SLOTS;slot++) {
@@ -903,18 +903,49 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(tulip_collisions_obj, 0, 0, tulip_col
 
 
 
-extern void editor(const char * filename);
+extern void editor_start(const char * filename);
+extern void editor_activate();
+extern void editor_key(int c); 
+extern void editor_deinit();
+
+
 STATIC mp_obj_t tulip_run_editor(size_t n_args, const mp_obj_t *args) {
     if(n_args) {
-        editor(mp_obj_str_get_str(args[0]));
+        editor_start(mp_obj_str_get_str(args[0]));
     } else {
-        editor(NULL);
+        editor_start(NULL);
     }
     return mp_const_none;
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(tulip_run_editor_obj, 0, 1, tulip_run_editor);
 
+
+STATIC mp_obj_t tulip_key_editor(size_t n_args, const mp_obj_t *args) {
+    editor_key(mp_obj_get_int(args[0]));
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(tulip_key_editor_obj, 1, 1, tulip_key_editor);
+
+
+
+STATIC mp_obj_t tulip_deinit_editor(size_t n_args, const mp_obj_t *args) {
+    editor_deinit();
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(tulip_deinit_editor_obj, 0, 0, tulip_deinit_editor);
+
+
+STATIC mp_obj_t tulip_activate_editor(size_t n_args, const mp_obj_t *args) {
+    editor_activate();
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(tulip_activate_editor_obj, 0, 1, tulip_activate_editor);
+
+
 extern void unix_display_timings(uint16_t, uint16_t, uint16_t, uint16_t);
 STATIC mp_obj_t tulip_gpu_reset(size_t n_args, const mp_obj_t *args) {
     display_reset_bg();
@@ -1386,6 +1417,9 @@ STATIC const mp_rom_map_elem_t tulip_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_wire_load), MP_ROM_PTR(&tulip_wire_load_obj) },
     { MP_ROM_QSTR(MP_QSTR_collisions), MP_ROM_PTR(&tulip_collisions_obj) },
     { MP_ROM_QSTR(MP_QSTR_run_editor), MP_ROM_PTR(&tulip_run_editor_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit_editor), MP_ROM_PTR(&tulip_deinit_editor_obj) },
+    { MP_ROM_QSTR(MP_QSTR_key_editor), MP_ROM_PTR(&tulip_key_editor_obj) },
+    { MP_ROM_QSTR(MP_QSTR_activate_editor), MP_ROM_PTR(&tulip_activate_editor_obj) },
     { MP_ROM_QSTR(MP_QSTR_int_screenshot), MP_ROM_PTR(&tulip_int_screenshot_obj) },
     { MP_ROM_QSTR(MP_QSTR_multicast_start), MP_ROM_PTR(&tulip_multicast_start_obj) },
     { MP_ROM_QSTR(MP_QSTR_alles_send), MP_ROM_PTR(&tulip_alles_send_obj) },
diff --git a/tulip/shared/py/tulip.py b/tulip/shared/py/tulip.py
index 5842038b1..a7117cbd9 100644
--- a/tulip/shared/py/tulip.py
+++ b/tulip/shared/py/tulip.py
@@ -25,6 +25,7 @@ def rgb(px0, wide=False):
     return (r,g,b)
 
 from ui import *
+from editor import edit
 
 
 # A class for making a game. Clears and sets up the screen for a game
@@ -32,7 +33,6 @@ class Game():
     def __init__(self, debug=False):
         self.debug = debug
         if(not debug):
-            tfb_save()
             tfb_stop()
         key_scan(1) # enter direct scan mode, keys will not hit the REPL this way
         Sprite.reset()  # resets sprite counter and RAM
@@ -440,14 +440,6 @@ def reload(module):
         pass # it's ok
     exec('import %s' % (thing))
 
-def edit(filename=None):
-    if(filename is None):
-        tulip.run_editor()
-    else:
-        tulip.run_editor(filename)
-    # For now, just force a repl re-draw for any elements drawn on the repl (including task bar)
-    # TODO later make editor an app
-    repl_screen.group.invalidate()
 
 def app(switch=None):
     if(switch is None):
diff --git a/tulip/shared/py/ui.py b/tulip/shared/py/ui.py
index e2a6a7716..f10bbb89c 100644
--- a/tulip/shared/py/ui.py
+++ b/tulip/shared/py/ui.py
@@ -8,9 +8,6 @@
 lv_launcher = None
 
 
-# For our convenience functions, Can be overriden
-tulip.ui_callback = None
-
 running_apps = {}
 current_app_string = "repl"
 
@@ -167,7 +164,7 @@ def screen_quit_callback(self, e):
     # add an obj (or list of obj) to the screen, aligning by the last one added,
     # or the object relative (if you want to for example make a new line)
     # or x,y directly if you want that
-    def add(self, obj, direction=lv.ALIGN.OUT_RIGHT_MID, relative=None, pad_x=0, pad_y=0, x=None, y=None):
+    def add(self, obj, first_align=lv.ALIGN.TOP_LEFT, direction=lv.ALIGN.OUT_RIGHT_MID, relative=None, pad_x=0, pad_y=0, x=None, y=None):
         if(relative is not None):
             self.last_obj_added = relative.group
 
@@ -178,9 +175,13 @@ def add(self, obj, direction=lv.ALIGN.OUT_RIGHT_MID, relative=None, pad_x=0, pad
             o.group.set_style_bg_color(pal_to_lv(self.bg_color), lv.PART.MAIN)
             o.group.set_height(lv.SIZE_CONTENT)
             if(self.last_obj_added is None):
-                o.group.align_to(self.group,lv.ALIGN.TOP_LEFT,self.offset_x,self.offset_y)
+                o.group.align_to(self.group,first_align,self.offset_x,self.offset_y)
             else:
-                o.group.align_to(self.last_obj_added, direction,0,0)
+                try:
+                    o.group.align_to(self.last_obj_added, direction,0,0)
+                except lv.LvReferenceError:
+                    self.last_obj_added = None
+                    o.group.align_to(self.group,first_align,self.offset_x,self.offset_y)
             o.group.set_width(o.group.get_width()+pad_x)
             o.group.set_height(o.group.get_height()+pad_y)
             if(x is not None and y is not None): o.group.set_pos(x,y)
@@ -196,10 +197,13 @@ def present(self):
 
         if(self.handle_keyboard):
             get_keypad_indev().set_group(self.kb_group)
+
         if(self.name == 'repl'):
             tulip.tfb_start()
             tulip.set_screen_as_repl(1)
+
             tulip.tfb_update() # force redraw of tfb, maybe tfb_start should do this? 
+
         else:
             tulip.set_screen_as_repl(0)
             if(self.keep_tfb):
@@ -233,6 +237,13 @@ def update_callbacks(self, cb):
         pass
         #self.change_callback = cb
 
+    # Remove the elements you created (including the group)
+    def remove_items(self):
+        for i in range(self.group.get_child_count()):
+            if(self.group.get_child(0) is not None):
+                self.group.get_child(0).delete()
+        self.group.delete()
+
 
 # Callback for soft keyboard to send chars to Tulip.
 def lv_soft_kb_cb(e):
@@ -333,27 +344,58 @@ def launcher(ignore=True):
     b_power.add_event_cb(launcher_cb, lv.EVENT.CLICKED, None)
 
 
+# A text entry widget w/ ok and cancel 
+class TextEntry(UIElement):
+    def __init__(self, label_text="", filled_text="", ok_callback=None, cancel_callback=None, bg_color=0, fg_color=255):
+        super().__init__()
+        self.group.set_size(420,80)
+        self.box = lv.obj(self.group)
+        self.box.set_style_bg_color(pal_to_lv(bg_color), lv.PART.MAIN)
+        self.box.set_size(400,80)
+        self.box.align_to(self.group, lv.ALIGN.CENTER,0,0)
+        self.label = lv.label(self.box)
+        self.label.set_style_text_color(pal_to_lv(fg_color),0)
+        self.label.set_text(label_text)
+        self.label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0)
+        self.label.align_to(self.box,lv.ALIGN.LEFT_MID,0,0)
+
+        self.text = lv.textarea(self.box)
+        self.text.set_size(150,45)
+        self.text.add_text(filled_text)
+        self.text.align_to(self.label, lv.ALIGN.OUT_RIGHT_MID,10,0)
+
+        self.ok = lv.button(self.box)
+        self.ok.set_style_bg_color(pal_to_lv(29), lv.PART.MAIN)
+        ok_label = lv.label(self.ok)
+        ok_label.set_style_text_font(lv.font_montserrat_12,0)
+        ok_label.set_text(lv.SYMBOL.OK)
+        ok_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0)
+        self.ok.align_to(self.text, lv.ALIGN.OUT_RIGHT_MID,10,0)
+        self.ok.add_event_cb(self.ok_callback, lv.EVENT.CLICKED, None)
+        self.cancel = lv.button(self.box)
+        self.cancel.set_style_bg_color(pal_to_lv(224), lv.PART.MAIN)
+        cancel_label = lv.label(self.cancel)
+        cancel_label.set_style_text_font(lv.font_montserrat_12,0)
+        cancel_label.set_text(lv.SYMBOL.CLOSE)
+        cancel_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0)
+        self.cancel.align_to(self.ok, lv.ALIGN.OUT_RIGHT_MID,10,0)
+        self.cancel.add_event_cb(self.cancel_callback, lv.EVENT.CLICKED, None)
+        self.box.remove_flag(lv.obj.FLAG.SCROLLABLE)
+        self.group.remove_flag(lv.obj.FLAG.SCROLLABLE)
+        self.external_ok_callback = ok_callback
+        self.external_cancel_callback = cancel_callback
 
+    def ok_callback(self, e):
+        if(self.external_ok_callback):
+            self.external_ok_callback()
+        self.remove_items()
+
+    def cancel_callback(self, e):
+        if(self.external_cancel_callback):
+            self.external_cancel_callback()
+        self.remove_items()
 
-# Callback that you can have LVGL objects register. 
-# It gets the event (which you can get the object from) and "extra" which we put ui_id in for legacy uses
-def lv_callback(e, extra):
-    code = e.get_code()
-    obj = e.get_target_obj()
-    if(tulip.ui_callback is not None):
-        tulip.ui_callback(obj, code, extra)
 
-# Draw a msgbox on screen. 
-def ui_msgbox(buttons=['OK', 'Cancel'], title='Title', message='Message box', ui_id=None):
-    mbox = lv.msgbox(current_lv_group())
-    mbox.add_text(message)
-    mbox.add_title(title)
-    mbox.add_close_button()
-    for b in buttons:
-        mbox.add_footer_button(b)
-    if(ui_id is not None):
-        mbox.add_event_cb(lambda e: lv_callback(e, ui_id), lv.EVENT.CLICKED, None)
-    return mbox
 
 # bar_color - the color of the whole bar, or just the set part if using two colors
 # unset_bar_color - the color of the unset side of the bar, if None will just be all one color
@@ -440,6 +482,21 @@ def __init__(self, text, x=0, y=0, fg_color=None, font=None):
         self.group.remove_flag(lv.obj.FLAG.SCROLLABLE)
         self.label.align_to(self.group, lv.ALIGN.CENTER,0, 0)
 
+# TODO: Make UIMsgBox
+# Draw a msgbox on screen. 
+def ui_msgbox(buttons=['OK', 'Cancel'], title='Title', message='Message box', ui_id=None):
+    mbox = lv.msgbox(current_lv_group())
+    mbox.add_text(message)
+    mbox.add_title(title)
+    mbox.add_close_button()
+    for b in buttons:
+        mbox.add_footer_button(b)
+    if(ui_id is not None):
+        mbox.add_event_cb(lambda e: lv_callback(e, ui_id), lv.EVENT.CLICKED, None)
+    return mbox
+
+# TODO : make UIText
+
 # Copy of our ui_text with lvgl textarea 
 #tulip.ui_text(ui_element_id, default_value, x, y, w, h, text_color, box_color, font_number)
 def ui_text(ui_id=None, text=None, placeholder=None, x=0, y=0, w=None, h=None, bg_color=None, fg_color=None, font=None, one_line=True):
@@ -464,6 +521,8 @@ def ui_text(ui_id=None, text=None, placeholder=None, x=0, y=0, w=None, h=None, b
         ta.add_event_cb(lambda e: lv_callback(e, ui_id), lv.EVENT.VALUE_CHANGED, None)
     return ta
 
+# TODO: Make UICheckbox
+
 # Copy of our ui_checkbox with lvgl 
 def ui_checkbox(ui_id=None, text=None, val=False, x=0, y=0, bg_color=None, fg_color=None):
     cb = lv.checkbox(current_lv_group())
@@ -480,6 +539,8 @@ def ui_checkbox(ui_id=None, text=None, val=False, x=0, y=0, bg_color=None, fg_co
         cb.add_event_cb(lambda e: lv_callback(e, ui_id), lv.EVENT.VALUE_CHANGED, None)
     return cb
 
+#TODO : Make UILabel 
+
 
 
 repl_screen = UIScreen("repl", bg_color=9, handle_keyboard=True)