not sure what I did here
merging my files with bryan
EVERY BUTTON WORKS