Add args to win-start, make more modular