Missing dict keys

This should really be improved on when we update forms. There are a ton of better ways to do this.

All tests pass.