Updated Touchpad and added testing