Done for now (checkboxes still not working)