Similar to the other PR, can you leave a note about why there's stuff commented out in the comments?