Number 3 on TODO is resolved.