Is this todo still valid? If so is it feasible to take care of it before this merge? @lizlux