added in mayeli's additions
todos for tomorrow