Added several fields, got validation working, etc