[WIP] Marriage abroad changes