started to add checkbox (work in progress)