BOOM fixed up some stuff. Need to persist data