Please pay particular attention to the schema when you're comparing your work to my rebase. Point out any errors I committed so we can fix them.