Slider created
Major merge conflict partly solved