#1859 - +@machabamachaba @johncowie - Refactoring form fields to accept all models