Fix up Card Collection

Got rid of ‘defaults’ and put all back into its own collection.
Fix up data waitOn + misc
Not ideal but got the form working

I know I can do this smarter but its a start, duplicate schema
definitions to ensure validation works.