Wrote some todos