More organization and testing.