Preparing to make portable, if possible