Refactored dynamic fields to match discussions about making it simpler (add only)
Refactored dynamic fields to match discussions about making it simpler (add only)

tessafallon/dhf,tessafallon/dhf,tessafallon/dhf