refactor to fix intrinsic issues, move towards mod-rxvertx