Feature/club 682

This PR does not resolve the ticket but does finish about 80% of the desired acceptance. Tomorrow Joris will finalize his wishes for form validation.