Checking in json-order, initial checkbox refactoring