diff --git a/src/app/unlock.coffee b/src/app/unlock.coffee
index 6d3f77aa0b..41f6dc044f 100644
--- a/src/app/unlock.coffee
+++ b/src/app/unlock.coffee
@@ -64,3 +64,13 @@ module.exports.app = (appExports, model) ->
     model._dontPersist = dontPersist
 
     $('#drops-enabled-modal').modal 'show'
+
+  user.on 'push', 'items.pets', (after, before) ->
+    return if user.get('achievements.beastMaster')
+    if before >= 90 # evidently before is the count?
+      dontPersist =  model._dontPersist
+      model._dontPersist = false
+      user.set 'achievements.beastMaster', true, ->
+        model._dontPersist = dontPersist
+      $('#beastmaster-achievement-modal').modal('show')
+
diff --git a/styles/app/achievements.styl b/styles/app/achievements.styl
index 31c9d40b2a..82046a22d6 100644
--- a/styles/app/achievements.styl
+++ b/styles/app/achievements.styl
@@ -1,7 +1,13 @@
+.achievements-container
+    margin: 20px
+
 .achievement
     background: url('/img/sprites/achievements.png') no-repeat
     width: 24px
     height: 26px
+    float:left
+    clear:right
+    margin-right: 10px
 
 .achievement-sword {background-position:0px 0px}
 .achievement-tree {background-position:-24px 0px}
diff --git a/views/app/avatar.html b/views/app/avatar.html
index 06967dfc04..bc81fb7411 100644
--- a/views/app/avatar.html
+++ b/views/app/avatar.html
@@ -164,28 +164,34 @@
     </div>
 
 <achievements:>
-    <!--<div class='achievement achievement-sword'></div>-->
-    <!--<div class='achievement achievement-tree'></div>-->
-    <!--<div class='achievement achievement-rat'></div>-->
-    <!--<div class='achievement achievement-comment'></div>-->
-    <!--<div class='achievement achievement-armor'></div>-->
-    <!--<div class='achievement achievement-cave'></div>-->
-    <!--<div class='achievement achievement-sun'></div>-->
-    <!--<div class='achievement achievement-boot'></div>-->
-    <!--<div class='achievement achievement-coffin'></div>-->
-    <!--<div class='achievement achievement-alien'></div>-->
-    <!--<div class='achievement achievement-ninja'></div>-->
-    <!--<div class='achievement achievement-cactus'></div>-->
-    <!--<div class='achievement achievement-bow'></div>-->
-    <!--<div class='achievement achievement-heart'></div>-->
-    <!--<div class='achievement achievement-shield'></div>-->
-    <!--<div class='achievement achievement-thermometer'></div>-->
-    <!--<div class='achievement achievement-helm'></div>-->
-    <!--<div class='achievement achievement-firefox'></div>-->
-    <!--<div class='achievement achievement-karaoke'></div>-->
-    {#if @profile.achievements.originalUser}
-        <div class='achievement achievement-cake'></div>  Original User!
-    {/}
+    <div class='achievements-container'>
+        <!--<div class='achievement achievement-sword'></div>-->
+        <!--<div class='achievement achievement-tree'></div>-->
+        <!--<div class='achievement achievement-comment'></div>-->
+        <!--<div class='achievement achievement-armor'></div>-->
+        <!--<div class='achievement achievement-cave'></div>-->
+        <!--<div class='achievement achievement-sun'></div>-->
+        <!--<div class='achievement achievement-boot'></div>-->
+        <!--<div class='achievement achievement-coffin'></div>-->
+        <!--<div class='achievement achievement-alien'></div>-->
+        <!--<div class='achievement achievement-ninja'></div>-->
+        <!--<div class='achievement achievement-cactus'></div>-->
+        <!--<div class='achievement achievement-bow'></div>-->
+        <!--<div class='achievement achievement-heart'></div>-->
+        <!--<div class='achievement achievement-shield'></div>-->
+        <!--<div class='achievement achievement-thermometer'></div>-->
+        <!--<div class='achievement achievement-helm'></div>-->
+        <!--<div class='achievement achievement-firefox'></div>-->
+        <!--<div class='achievement achievement-karaoke'></div>-->
+        {#if @profile.achievements.originalUser}
+            <div class='achievement achievement-cake'></div>Original User
+            <hr/>
+        {/}
+        {#if @profile.achievements.beastMaster}
+            <div class='achievement achievement-rat'></div>Beast Master
+        {/}
+
+    </div>
 
 <inventory:>
     <!-- we'll have other inventory here later too, like enchantments, quest scrolls, etc -->
diff --git a/views/app/pets.html b/views/app/pets.html
index db64b7236b..9f73962b55 100644
--- a/views/app/pets.html
+++ b/views/app/pets.html
@@ -16,6 +16,15 @@
     </@footer>
   </app:modals:modal>
 
+    <app:modals:modal modalId='beastmaster-achievement-modal' header="Achievement Unlocked!">
+        <p>
+            <div class='achievement achievement-rat'></div>You have earned the "Beast Master" Achievement for collecting all the pets!
+        </p>
+        <@footer>
+            <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+        </@footer>
+    </app:modals:modal>
+
 <pet:>
     <td class="{#if _user.items.pets[.name]}active-pet{/}">
         <img rel=tooltip title="{.text} - {.value} Tokens" x-bind="click:selectPet" data-pet='{.name}' src='img/sprites/{.icon}'/>