Major redesign commit.