More model implementation and testing.