Smartanswers: Marriage abroad - Flow update

I also started to refactor part of the code 
https://www.pivotaltracker.com/story/show/70853444