add working checkboxes
refactor