Client overhaul - work on curses