Almost complite - only new checkbox done