Updated commenting. Focusing on my design decisions