Integrate rna

Just like #2 but rebased and with the right RNA submodule.