Elavon rebased

@daviddemello could you take a look when you have some time, and let me know if you have questions? Or maybe we can review together tomorrow. Thanks.