Further testing and refactor of RT

Please enter the commit message for your changes. Lines starting