As it is now, it still raises the "ABI" error but I think we should get rid of that. I'll refactor the code based on your suggestions.