Refactor and add Curses