Updating the TODO with environment testing needing to be done.