Still working on getting those checkboxes working correctly