Began super refactory.