Feature/17 valid on add

Fixes #17