add some of form
pass user integration spec
refactor tests, make sure everything gets cleaned up