played around with a button
played around with a toggle
Merge remote-tracking branch 'origin/master'