diff --git a/views/app/avatar.html b/views/app/avatar.html
index 543b5053dc..b3a0c79619 100644
--- a/views/app/avatar.html
+++ b/views/app/avatar.html
@@ -1,7 +1,7 @@
 <modals:>
-    {{#each _partyMembers as :profile}}
-        <app:modals:modal modalId="avatar-modal-{{:profile.id}}">
-            <app:avatar:profile profile={{:profile}} />
+    {{#each _party.members as :memberId}}
+        <app:modals:modal modalId="avatar-modal-{{:memberId}}">
+            <app:avatar:profile profile={{_members[:memberId]}} />
             <@footer>
                 <button data-dismiss="modal" class="btn btn-success">Ok</button>
             </@footer>
diff --git a/views/app/challenges.html b/views/app/challenges.html
index 9f66d21ada..eb3171e8ac 100644
--- a/views/app/challenges.html
+++ b/views/app/challenges.html
@@ -102,8 +102,8 @@
                                     <div><input type='radio' name='challenge-party-selection' checked={not(_challenge.new.partyAssignees)} >Individual Members</input></div>
                                     <div>
                                         <select multiple="multiple">
-                                        {{#each _partyMembers as :member}}
-                                            <option>{{username(:member.auth,:member.profile.name)}}</option>
+                                        {{#each _party.members as :memberId}}
+                                            <option>{{username(_members[:memberId].auth,_members[:memberId].profile.name)}}</option>
                                         {{/}}
                                         </select>
                                     </div>
diff --git a/views/app/header.html b/views/app/header.html
index 2238925593..02121a3efc 100644
--- a/views/app/header.html
+++ b/views/app/header.html
@@ -1,5 +1,5 @@
 <header:>
-    <header class="site-header {#if _user.preferences.hideHeader}hidden{/}" role="banner" data-partySize="{#if gt(_partyMembers.length,1)}{truarr(_partyMembers.length)}{else}0{/}">
+    <header class="site-header {#if _user.preferences.hideHeader}hidden{/}" role="banner" data-partySize="{#if gt(_party.memebers.length,1)}{truarr(_party.members.length)}{else}0{/}">
         <!-- avatar -->
         <div class="herobox-wrap main-herobox">
             <app:avatar:avatar profile={_user} main=true>
@@ -27,10 +27,10 @@
         <!-- I have an idea to use this loop for the user's herobox/avatar as well
              NOTE TO SELF: Ask Tyler if some kind of inter-leaving is possible
              where we can put ONE of the results of this loop BEFORE the progress bars, and the rest after-->
-        {{#each _partyMembers as :member}}
-            <div class="herobox-wrap" style="{{#if equal(:member.id, _userId)}}display:none;{{/}}">
-                {{#unless equal(:member.id, _userId)}}
-                    <app:avatar:avatar profile={{:member}} party="true" />
+        {{#each _party.members as :memberId}}
+            <div class="herobox-wrap" style="{{#if equal(:memberId, _userId)}}display:none;{{/}}">
+                {{#unless equal(:memberId, _userId)}}
+                    <app:avatar:avatar profile={{_members[:memberId]}} party="true" />
                 <!-- Would be way cleaner as a Derby template `data-content="<app:party:member-stats profile={{:member}} />"`, but it was just printing HTML as text -->
                 <!-- I've re-implemented the rollover using the actual `herobox`/avatar template and data-attributes.
                     This Derby template idea would have been really handy but this is pretty versatile, and keeps it all in the avatar section -->
@@ -39,4 +39,4 @@
         {{/}}
 
         <app:alerts:hiding-bailey />
-    </header>
\ No newline at end of file
+    </header>
diff --git a/views/app/party.html b/views/app/party.html
index a2afcc2fa3..d0bd00f54f 100644
--- a/views/app/party.html
+++ b/views/app/party.html
@@ -1,11 +1,11 @@
 <party:>
-    {#if _partyMembers}
+    {#if _party.members}
         <div class='row-fluid'>
             <div class="span6 border-right">
                 <h3>{{_party.name}}</h3>
                 <table class="table table-striped">
-                    {{#each _partyMembers as :member}}
-                    <tr><td>{{username(:member.auth, :member.profile.name)}}</td><td>({{:member.id}})</td></tr>
+                    {{#each _party.members as :memberId}}
+                    <tr><td>{{username(_party[:memberId].auth, _party[:memberId].profile.name)}}</td><td>({{:memberId}})</td></tr>
                     {{/}}
                 </table>
                 <form class=form-inline x-bind="submit: partyInvite">