can you please split the CheckBox stuff/UI changes off, and let's just focus on the port for now?