Feature/non form values

Implements #34.