Some rewriting and a commandwin start.