And make the checkbox work for real