Updated to Windows form based program