diff --git a/Gemfile.lock b/Gemfile.lock
index 725be8a..167fadd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -52,7 +52,7 @@ GEM
       activesupport (~> 3.0)
       daemons
     erubis (2.7.0)
-    execjs (1.2.8)
+    execjs (1.2.9)
       multi_json (~> 1.0)
     haml (3.1.3)
     hike (1.2.1)
diff --git a/db/schema.rb b/db/schema.rb
index e4e9ba2..950b586 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,29 +11,32 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110922190755) do
+ActiveRecord::Schema.define(:version => 20110926002631) do
 
   create_table "album_formats", :force => true do |t|
-    t.integer  "album_id"
-    t.integer  "release_format_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.integer "album_id"
+    t.integer "release_format_id"
   end
 
+  add_index "album_formats", ["album_id"], :name => "index_album_formats_on_album_id"
+  add_index "album_formats", ["release_format_id"], :name => "index_album_formats_on_release_format_id"
+
   create_table "album_genres", :force => true do |t|
-    t.integer  "album_id"
-    t.integer  "genre_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.integer "album_id"
+    t.integer "genre_id"
   end
 
+  add_index "album_genres", ["album_id"], :name => "index_album_genres_on_album_id"
+  add_index "album_genres", ["genre_id"], :name => "index_album_genres_on_genre_id"
+
   create_table "album_styles", :force => true do |t|
-    t.integer  "album_id"
-    t.integer  "style_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.integer "album_id"
+    t.integer "style_id"
   end
 
+  add_index "album_styles", ["album_id"], :name => "index_album_styles_on_album_id"
+  add_index "album_styles", ["style_id"], :name => "index_album_styles_on_style_id"
+
   create_table "albums", :force => true do |t|
     t.string   "name"
     t.integer  "artist_id"
@@ -48,21 +51,28 @@ ActiveRecord::Schema.define(:version => 20110922190755) do
     t.boolean  "master"
   end
 
+  add_index "albums", ["artist_id"], :name => "index_albums_on_artist_id"
+  add_index "albums", ["has_pic"], :name => "index_albums_on_has_pic"
+  add_index "albums", ["master"], :name => "index_albums_on_master"
+  add_index "albums", ["name"], :name => "index_albums_on_name"
+  add_index "albums", ["year"], :name => "index_albums_on_year"
+
   create_table "artist_aliases", :force => true do |t|
-    t.integer  "artist_id"
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.integer "artist_id"
+    t.string  "name"
   end
 
+  add_index "artist_aliases", ["artist_id"], :name => "index_artist_aliases_on_artist_id"
+  add_index "artist_aliases", ["name"], :name => "index_artist_aliases_on_name"
+
   create_table "artist_links", :force => true do |t|
-    t.integer  "artist_id"
-    t.string   "service"
-    t.string   "url"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.integer "artist_id"
+    t.string  "service"
+    t.string  "url"
   end
 
+  add_index "artist_links", ["artist_id"], :name => "index_artist_links_on_artist_id"
+
   create_table "artists", :force => true do |t|
     t.string   "name"
     t.text     "desc"
@@ -77,6 +87,11 @@ ActiveRecord::Schema.define(:version => 20110922190755) do
     t.string   "original_name"
   end
 
+  add_index "artists", ["listeners"], :name => "index_artists_on_listeners"
+  add_index "artists", ["name"], :name => "index_artists_on_name"
+  add_index "artists", ["original_name"], :name => "index_artists_on_original_name"
+  add_index "artists", ["status"], :name => "index_artists_on_status"
+
   create_table "delayed_jobs", :force => true do |t|
     t.integer  "priority",   :default => 0
     t.integer  "attempts",   :default => 0
@@ -102,12 +117,10 @@ ActiveRecord::Schema.define(:version => 20110922190755) do
   end
 
   create_table "genres", :force => true do |t|
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string "name"
   end
 
-  create_table "local_brainz_releases", :force => true do |t|
+  create_table "local_brainz_cached_releases", :force => true do |t|
     t.string   "mbid"
     t.string   "title"
     t.string   "status"
@@ -119,7 +132,7 @@ ActiveRecord::Schema.define(:version => 20110922190755) do
     t.string   "format"
   end
 
-  create_table "local_brainz_tracks", :force => true do |t|
+  create_table "local_brainz_cached_tracks", :force => true do |t|
     t.integer  "position"
     t.string   "recording_id"
     t.string   "title"
@@ -144,12 +157,12 @@ ActiveRecord::Schema.define(:version => 20110922190755) do
   end
 
   create_table "release_formats", :force => true do |t|
-    t.string   "name"
-    t.string   "hash"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string "name"
+    t.string "hash"
   end
 
+  add_index "release_formats", ["hash"], :name => "index_release_formats_on_hash"
+
   create_table "sessions", :force => true do |t|
     t.integer  "user_id"
     t.string   "key"
@@ -157,21 +170,24 @@ ActiveRecord::Schema.define(:version => 20110922190755) do
     t.datetime "updated_at"
   end
 
+  add_index "sessions", ["key"], :name => "index_sessions_on_key"
+  add_index "sessions", ["user_id"], :name => "index_sessions_on_user_id"
+
   create_table "styles", :force => true do |t|
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string "name"
   end
 
   create_table "track_artists", :force => true do |t|
-    t.integer  "track_id"
-    t.integer  "artist_id"
-    t.boolean  "main"
-    t.string   "join"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.integer "track_id"
+    t.integer "artist_id"
+    t.boolean "main"
+    t.string  "join"
   end
 
+  add_index "track_artists", ["artist_id"], :name => "index_track_artists_on_artist_id"
+  add_index "track_artists", ["main"], :name => "index_track_artists_on_main"
+  add_index "track_artists", ["track_id"], :name => "index_track_artists_on_track_id"
+
   create_table "tracks", :force => true do |t|
     t.string   "name"
     t.integer  "album_id"
@@ -186,6 +202,11 @@ ActiveRecord::Schema.define(:version => 20110922190755) do
     t.string   "mbid"
   end
 
+  add_index "tracks", ["album_id"], :name => "index_tracks_on_album_id"
+  add_index "tracks", ["bonus"], :name => "index_tracks_on_bonus"
+  add_index "tracks", ["name"], :name => "index_tracks_on_name"
+  add_index "tracks", ["position"], :name => "index_tracks_on_position"
+
   create_table "users", :force => true do |t|
     t.string   "name"
     t.string   "email"
@@ -198,4 +219,7 @@ ActiveRecord::Schema.define(:version => 20110922190755) do
     t.integer  "music"
   end
 
+  add_index "users", ["name"], :name => "index_users_on_name"
+  add_index "users", ["vkid"], :name => "index_users_on_vkid"
+
 end