Did some todos