Updated to latest RDev, refactored templates to use RDev statements