Probably, I copied the old state wholesale and will be removing the unneeded bits as I move through it in the follow-up branches.