Delay validation

Closes #15 and #16