Refactor some code.
Now with >working checkboxes.
Now with working checkboxes.