WIP: Add stubs for validation