Implementing what is needed for tests to pass. Yikes.