Re-enable program options and added WIN32 sections, requires testing