Start pulling out common features from tables and collections.
Pull out more model code.