Got the CLI stuff working on a Windows machine