added some stuff. NEED TO CORRECT BUTTONS