Update

Jack's validation (incomplete)