diff --git a/templates/items/class.html b/templates/items/class.html
index 7ea8225e..de0fe204 100644
--- a/templates/items/class.html
+++ b/templates/items/class.html
@@ -82,19 +82,44 @@
                 </div>
             </div>
 
+            {{!-- Powercasting --}}
             <div class="form-group">
                 <label>{{localize 'SW5E.PowerProgression'}}</label>
                 <div class="form-fields">
-                    <select name="data.powercasting">
-                        {{#select data.powercasting}}
-                            {{#each config.powerProgression}}
-                                <option value="{{@key}}">{{localize this}}</option>
-                            {{/each}}
-                        {{/select}}
+                    <select name="data.powercasting.progression">
+                        {{selectOptions config.powerProgression selected=data.powercasting.progression localize=true}}
                     </select>
                 </div>
             </div>
 
+            <div class="form-group">
+                <label>{{localize "SW5E.PowerAbility"}}</label>
+                <div class="form-fields">
+                    <select name="data.powercasting.ability">
+                        {{selectOptions config.abilities selected=data.powercasting.ability blank=""}}
+                    </select>
+                </div>
+            </div>
+
+            {{!-- Proficiencies --}}
+            <div class="form-group">
+                <label>
+                    {{ localize "SW5E.ClassSaves" }}
+                    {{#if editable}}
+                    <a class="trait-selector class-saves" data-target="data.saves" data-options="saves">
+                        <i class="fas fa-edit"></i>
+                    </a>
+                    {{/if}}
+                </label>
+                <div class="form-fields">
+                    <ul class="traits-list">
+                        {{#each data.saves}}
+                            <li class="tag {{this}}">{{lookup ../config.abilities this}}</li>
+                        {{/each}}
+                    </ul>
+                </div>
+            </div>
+            
             {{!-- Level 1 skills --}}
             <div class="form-group">
                 <label>{{localize "SW5E.ClassSkillsNumber"}}</label>