Add validation and presave logic

Newline