Took out old code, changed v2 naming stuff. Unicorns and butterflies.