Some commenting and some tests.