Nimisha/split converge api

Does this todo need to get cleaned up in this PR? Or is there going to be a separate PR?