added checkboxes - previous functionality maintained
resolved merge conflicts with checkoff