David

Fixed merge conflicts, added sliders without functionality yet.