Added more curses funtionality