Keep track of ALL OF THE THINGS.

And make all the tests pass!