Start work on checklist item refactor