little work and more todos