Re-wrote todo