5 files changed, 14 insertions, 12 deletions
diff --git a/app/controllers/characters/hearth_controller.rb b/app/controllers/characters/hearth_controller.rb
index c525add..ab9676e 100644
--- a/app/controllers/characters/hearth_controller.rb
+++ b/app/controllers/characters/hearth_controller.rb
@@ -8,6 +8,7 @@ class Characters::HearthController < ApplicationController
       laboratory: [],
       spicebench: [],
       binding_array: [],
+      aetherloom: [],
     }
 
     Activity.where("gid like ?", "craft_%").each do |activity|
@@ -23,6 +24,8 @@ class Characters::HearthController < ApplicationController
             @amenity_activities[:spicebench].push(activity) && next
           when "binding_array"
             @amenity_activities[:binding_array].push(activity) && next
+          when "aetherloom"
+            @amenity_activities[:aetherloom].push(activity) && next
           else
             raise "Invalid amenity gid (#{requirement_data[:gid]}"
           end
diff --git a/app/controllers/chat_messages_controller.rb b/app/controllers/chat_messages_controller.rb
index 9112bb7..a299379 100644
--- a/app/controllers/chat_messages_controller.rb
+++ b/app/controllers/chat_messages_controller.rb
@@ -1,7 +1,10 @@
 class ChatMessagesController < ApplicationController
   def index
-    # TODO: Let's rename this method to #list
-    @chat_messages = ChatMessage.order(created_at: :desc).limit(100).reverse
+    @chat_messages = ChatMessage.order(created_at: :desc).limit(2000)
+  end
+
+  def list
+    @chat_messages = ChatMessage.order(created_at: :asc).limit(200)
     render partial: "chat_messages/list"
   end
 
diff --git a/app/controllers/game_controller.rb b/app/controllers/game_controller.rb
index 39ea6c9..4bbbf53 100644
--- a/app/controllers/game_controller.rb
+++ b/app/controllers/game_controller.rb
@@ -18,7 +18,7 @@ class GameController < ApplicationController
 
   def stop_activity
     current_char.stop_activity
-    redirect_to locations_path
+    redirect_to look_path
   end
 
   def finish_activity
diff --git a/app/controllers/locations_controller.rb b/app/controllers/locations_controller.rb
deleted file mode 100644
index 4616c3d..0000000
--- a/app/controllers/locations_controller.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class LocationsController < ApplicationController
-  def index
-    @locations = Location.all
-  end
-
-  def show
-    @location = Location.find(params[:id])
-  end
-end
diff --git a/app/controllers/look_controller.rb b/app/controllers/look_controller.rb
new file mode 100644
index 0000000..e604670
--- /dev/null
+++ b/app/controllers/look_controller.rb
@@ -0,0 +1,5 @@
+class LookController < ApplicationController
+  def look
+    @location = current_char.location
+  end
+end