Lots of changes to get the options correct and to pass around all the needed information... not done, but it is starting to come together
merger