Separating logic out a little, version bump.