now fixing issue with buttons making things crash. Stupid buttons.