Made progress on the dynamic forms, still ongoing though