More docs and todos