Started work on interactive mode, still lots to do