Dan needs to review the final code and verify hes happy with comments.

[Daniel-Martinez]

The code looks great and is working fine. We might want to comment more.