[BROKEN] Put in state formatting