[WIP] Better Validation