Starting refactor on list.