Adding a few comments as hints.
Starting on tests.