Initial RDS work fleshed out