knocking off the todo on null values