[WIP] Validation component

Yep, fixed thanks