WIP: Sr working

D M S Sultan requested to merge SRWorking into master Oct 26, 2017