Add registerable validators
Clean up
Finish validation