Updating TODO to include other operations that need implementation