Updated todos about missing pieces