Comment by vidoss

Great feedback. Moving this line by line to my TODO. Thanks again.