+ NANP trunk code, + TODOs, + optimization
- Validators (for now)
- Validators (part 2)