Noah's commit adds awesome comments