[PATCH 1/3] TODO: Add new tasks