Add comments
Add contact modal
Refactor classes