More adding STATUS_CHOICES to things

wheee