SDR Changes - Unfinished

SDR inclusion, changes to be further finished on home PC