#59 Adding the great toggling feature that we actually wanted :)