First cut of enabling FillInstance() to populate fields
Minor tweaks to variable names