Eng 6374

review only waiting for some clarity on option for configuration and naming.