Org types for form

I think this fixes them