EPD-190: Work on incorporating new settings classes into EPD shore