Strike another TODO off the list