Am I right in thinking that changing from a retirement extension to a marriage extension SHOULD be straight forward enough ?