Adding more record types and filling out the functionality as driven by the tests.