RDS changes to develop

Time to get these merged in before i fall so far behind again.