Updated with command line args and other windows specifics