Change var place holder
Rename units as templates & prep as indexable