Rebase sg

Since this is going to be deprecated once we have the new scenario builder I think it is not worth it.