Rewrote command line PART 2