Addressing Build Issues for Windows

TAB!!! :)