v0.0.2 - add better validation