I like what this is doing, but we might want to move some of it out of the states file.