Merge lp:~rockstar/ubuntuone-ios-music/storyboard-20api-views into lp:ubuntuone-ios-music

[Paul Hummer]

Use 2.0 Music API

This branch is the mother branch. It looks huge. It's not. A majority of this code has already been reviewed and merged into the re-write branch. Basically, revision 244+ is what needs to be reviewed. I'll make it easy on you by linking to the individual revisions (I tried to keep them making sense).

http://bazaar.launchpad.net/~rockstar/ubuntuone-ios-music/storyboard-20api-views/revision/244
http://bazaar.launchpad.net/~rockstar/ubuntuone-ios-music/storyboard-20api-views/revision/245
http://bazaar.launchpad.net/~rockstar/ubuntuone-ios-music/storyboard-20api-views/revision/246
http://bazaar.launchpad.net/~rockstar/ubuntuone-ios-music/storyboard-20api-views/revision/247
http://bazaar.launchpad.net/~rockstar/ubuntuone-ios-music/storyboard-20api-views/revision/248
http://bazaar.launchpad.net/~rockstar/ubuntuone-ios-music/storyboard-20api-views/revision/249

[Michał Karnicki (karni)]

review: Approve

=== added directory 'Music'
=== added directory 'Music/Models'
=== added file 'Music/Models/Album.h'
--- Music/Models/Album.h	1970-01-01 00:00:00 +0000
+++ Music/Models/Album.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,29 @@
+//
+//  Album.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/17/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "Artist.h"
+#import "UOModel.h"
+
+@class RKObjectManager;
+
+@interface Album : UOModel
+@property (nonatomic, retain) NSString *albumId;
+@property (nonatomic, retain) NSString *title;
+@property (nonatomic, retain) NSString *url;
+@property (nonatomic, retain) NSString *artHash;
+
+@property (nonatomic, retain, readonly) NSString *dearticlizedTitle;
+@property (nonatomic, retain, readonly) NSString *index;
+
+@property (nonatomic, retain) NSString *artistId;
+@property (nonatomic, retain, readonly) Artist *artist;
+
+@property (nonatomic, retain) NSSet *songs;
+
+@end

=== added file 'Music/Models/Album.m'
--- Music/Models/Album.m	1970-01-01 00:00:00 +0000
+++ Music/Models/Album.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,94 @@
+//
+//  Album.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/17/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "Album.h"
+#import <RestKit/RestKit.h>
+#import <RestKit/CoreData.h>
+#import "Artist.h"
+#import "NSString+Extras.h"
+#import "UOAppDelegate.h"
+
+@implementation Album
+@dynamic albumId;
+@dynamic title;
+@dynamic url;
+@dynamic artHash;
+@dynamic dearticlizedTitle;
+
+@synthesize index;
+
+@synthesize artistId;
+@dynamic artist;
+
+@dynamic songs;
+
+#pragma mark - UOModel methods
+
++ (RKEntityMapping *)objectMapping {
+    RKObjectManager *manager = [RKObjectManager sharedManager];
+    
+    RKEntityMapping *mapping = [RKEntityMapping mappingForEntityForName:@"Album" inManagedObjectStore:manager.managedObjectStore];
+    [mapping setIdentificationAttributes:@[@"albumId"]];
+    [mapping addAttributeMappingsFromDictionary:@{
+     @"id": @"albumId",
+     @"album_url": @"url",
+     @"cover_art": @"artHash",
+     @"album_art_url": @"artUrl",
+     @"title": @"title",
+     @"artist_id": @"artistId"
+     }];
+    
+    return mapping;
+}
+
++ (NSString *)keyPath {
+    return @"response.albums";
+}
+
+- (NSString *)artPath {
+    return [[[[UOAppDelegate delegate] albumArtDirectory] URLByAppendingPathComponent:[NSString stringWithFormat:@"album-%@.jpg", self.albumId]] path];
+}
+
+#pragma mark - Model specific methods
+
+- (void)setTitle:(NSString *)title {
+    [self setPrimitiveValue:title forKey:@"title"];
+    [self setValue:[[title dearticlizedString] uppercaseString] forKey:@"dearticlizedTitle"];
+}
+
+- (void)setArtistId:(NSString *)_artistId {
+    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
+    NSEntityDescription *entity = [NSEntityDescription entityForName:@"Artist" inManagedObjectContext:self.managedObjectContext];
+    [fetchRequest setEntity:entity];
+    
+    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(artistId = %@)", _artistId];
+    [fetchRequest setPredicate:predicate];
+    
+    NSError *error;
+    NSArray *results = [self.managedObjectContext executeFetchRequest:fetchRequest error:&error];
+    if (error || [results count] != 1) {
+        abort();
+    }
+    
+    Artist *_artist = [results objectAtIndex:0];
+    [self setPrimitiveValue:_artist forKey:@"artist"];
+}
+
+- (NSString *)artistId {
+    return self.artist.artistId;
+}
+
+- (NSString *)index {
+    [self willAccessValueForKey:@"index"];
+    NSString *_index = [[self.title dearticlizedIndex] uppercaseString];
+    [self didAccessValueForKey:@"index"];
+    return _index;
+}
+
+
+@end

=== added file 'Music/Models/Artist.h'
--- Music/Models/Artist.h	1970-01-01 00:00:00 +0000
+++ Music/Models/Artist.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,24 @@
+//
+//  Artist.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/16/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "UOModel.h"
+
+@class RKObjectManager;
+
+@interface Artist : UOModel
+@property (nonatomic, retain) NSString *artistId;
+@property (nonatomic, retain) NSString *name;
+@property (nonatomic, retain) NSString *url;
+
+@property (nonatomic, retain, readonly) NSString *dearticlizedName;
+@property (nonatomic, retain, readonly) NSString *index;
+
+@property (nonatomic, retain) NSSet *albums;
+
+@end

=== added file 'Music/Models/Artist.m'
--- Music/Models/Artist.m	1970-01-01 00:00:00 +0000
+++ Music/Models/Artist.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,61 @@
+//
+//  Artist.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/16/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "Artist.h"
+#import <RestKit/RestKit.h>
+#import "NSString+Extras.h"
+#import "UOAppDelegate.h"
+
+@implementation Artist
+@dynamic artistId;
+@dynamic name;
+@dynamic url;
+@dynamic albums;
+@dynamic dearticlizedName;
+
+@synthesize index;
+
+#pragma mark - UOModel methods
+
++ (RKEntityMapping *)objectMapping {
+    RKObjectManager *manager = [RKObjectManager sharedManager];
+    
+    RKEntityMapping *mapping = [RKEntityMapping mappingForEntityForName:@"Artist" inManagedObjectStore:manager.managedObjectStore];
+    [mapping setIdentificationAttributes:@[@"artistId"]];
+    [mapping addAttributeMappingsFromDictionary:@{
+     @"id" : @"artistId",
+     @"artist": @"name",
+     @"artist_url": @"url",
+     @"artist_art_url": @"artUrl",
+     }];
+    return mapping;
+}
+
++ (NSString *)keyPath {
+    return @"response.artists";
+}
+
+- (NSString *)artPath {
+    return [[[[UOAppDelegate delegate] albumArtDirectory] URLByAppendingPathComponent:[NSString stringWithFormat:@"artist-%@.jpg", self.artistId]] path];
+}
+
+#pragma mark - Model specific methods
+
+- (void)setName:(NSString *)name {
+    [self setPrimitiveValue:name forKey:@"name"];
+    [self setValue:[[name dearticlizedString] uppercaseString] forKey:@"dearticlizedName"];
+}
+
+- (NSString *)index {
+    [self willAccessValueForKey:@"index"];
+    NSString *_index = [[self.name dearticlizedIndex] uppercaseString];
+    [self didAccessValueForKey:@"index"];
+    return _index;
+}
+
+@end

=== added file 'Music/Models/Playlist.h'
--- Music/Models/Playlist.h	1970-01-01 00:00:00 +0000
+++ Music/Models/Playlist.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,21 @@
+//
+//  Playlist.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/17/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "UOModel.h"
+
+@interface Playlist : UOModel
+@property (nonatomic, retain) NSString *playlistId;
+@property (nonatomic, retain) NSString *title;
+@property (nonatomic, retain) NSString *url;
+@property (nonatomic, retain) NSNumber *songCount;
+
+@property (nonatomic, retain, readonly) NSString *dearticlizedTitle;
+@property (nonatomic, retain, readonly) NSString *index;
+
+@end

=== added file 'Music/Models/Playlist.m'
--- Music/Models/Playlist.m	1970-01-01 00:00:00 +0000
+++ Music/Models/Playlist.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,52 @@
+//
+//  Playlist.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/17/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "Playlist.h"
+#import <RestKit/RestKit.h>
+#import "NSString+Extras.h"
+
+@implementation Playlist
+@dynamic playlistId;
+@dynamic title;
+@dynamic url;
+@dynamic songCount;
+@dynamic dearticlizedTitle;
+
+@synthesize index;
+
++ (RKEntityMapping *)objectMapping {
+    RKObjectManager *manager = [RKObjectManager sharedManager];
+    
+    RKEntityMapping *mapping = [RKEntityMapping mappingForEntityForName:@"Playlist" inManagedObjectStore:manager.managedObjectStore];
+    [mapping setIdentificationAttributes:@[@"playlistId"]];
+    [mapping addAttributeMappingsFromDictionary:@{
+     @"id": @"playlistId",
+     @"playlist_url": @"url",
+     @"name": @"title",
+     @"song_count": @"songCount",
+     }];
+    return mapping;
+}
+
++ (NSString *)keyPath {
+    return @"response.playlists";
+}
+
+- (void)setTitle:(NSString *)_title {
+    [self setPrimitiveValue:_title forKey:@"title"];
+    [self setValue:[[_title dearticlizedString] uppercaseString] forKey:@"dearticlizedTitle"];
+}
+
+- (NSString *)index {
+    [self willAccessValueForKey:@"index"];
+    NSString *_index = [[self.title dearticlizedIndex] uppercaseString];
+    [self didAccessValueForKey:@"index"];
+    return _index;
+}
+
+@end

=== added file 'Music/Models/Song.h'
--- Music/Models/Song.h	1970-01-01 00:00:00 +0000
+++ Music/Models/Song.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,45 @@
+//
+//  Song.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/17/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "UOModel.h"
+
+@class Album;
+@class Artist;
+
+@interface Song : UOModel
+
+@property (nonatomic, retain) NSString *url;
+@property (nonatomic, retain) NSString *suffix;
+@property (nonatomic, retain) NSString *track;
+@property (nonatomic, retain) NSString *title;
+@property (nonatomic, retain) NSString *bitRate;
+@property (nonatomic, retain) NSString *songId;
+@property (nonatomic, retain) NSString *duration;
+@property (nonatomic, retain) NSString *discNumber;
+@property (nonatomic, retain) NSString *streamUrl;
+@property (nonatomic, retain) NSString *contentType;
+@property (nonatomic, retain) NSString *year;
+@property (nonatomic, retain) NSString *genre;
+@property (nonatomic, retain) NSString *path;
+@property (nonatomic, retain) NSString *size;
+
+@property (nonatomic, retain, readonly) NSString *dearticlizedTitle;
+@property (nonatomic, retain, readonly) NSString *index;
+
+@property (nonatomic, retain) NSString *artistId;
+@property (nonatomic, retain) NSString *albumId;
+@property (nonatomic, retain) NSString *albumArtistId;
+
+@property (nonatomic, retain, readonly) Artist *artist;
+@property (nonatomic, retain, readonly) Album *album;
+@property (nonatomic, retain, readonly) Artist *albumArtist;
+
+@property (nonatomic, retain, readonly) NSString *idPath;
+
+@end

=== added file 'Music/Models/Song.m'
--- Music/Models/Song.m	1970-01-01 00:00:00 +0000
+++ Music/Models/Song.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,179 @@
+//
+//  Song.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/17/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "Song.h"
+#import <RestKit/RestKit.h>
+#import "Artist.h"
+#import "Album.h"
+#import "NSString+Extras.h"
+#import "UOAppDelegate.h"
+
+@implementation Song
+
+@dynamic url;
+@dynamic suffix;
+@dynamic track;
+@dynamic title;
+@dynamic bitRate;
+@dynamic songId;
+@dynamic duration;
+@dynamic discNumber;
+@dynamic streamUrl;
+@dynamic contentType;
+@dynamic year;
+@dynamic genre;
+@dynamic path;
+@dynamic size;
+@dynamic dearticlizedTitle;
+
+@synthesize index;
+/* Override to fall through to album's artUrl */
+@synthesize artUrl;
+
+@dynamic album;
+@dynamic artist;
+@dynamic albumArtist;
+
+#pragma mark - UOModel methods
+
++ (RKEntityMapping *)objectMapping {
+    RKObjectManager *manager = [RKObjectManager sharedManager];
+    
+    RKEntityMapping *mapping = [RKEntityMapping mappingForEntityForName:@"Song" inManagedObjectStore:manager.managedObjectStore];
+    [mapping setIdentificationAttributes:@[@"songId"]];
+    [mapping addAttributeMappingsFromDictionary:@{
+     @"song_url": @"url",
+     /* Disabled, since we want to fall through to album's art.
+     @"song_art_url": @"artUrl",
+      */
+     @"suffix": @"suffix",
+     @"track": @"track",
+     @"title": @"title",
+     @"album_artist_id": @"albumArtistId",
+     @"bit_rate": @"bitRate",
+     @"id": @"songId",
+     @"duration": @"duration",
+     @"disc_number": @"discNumber",
+     @"song_stream_url": @"streamUrl",
+     @"content_type": @"contentType",
+     @"year": @"year",
+     @"genre": @"genre",
+     @"path": @"path",
+     @"artist_id": @"artistId",
+     @"album_id": @"albumId",
+     @"size": @"size"
+     }];
+    return mapping;
+}
+
++ (NSString *)keyPath {
+    return @"response.songs";
+}
+
+- (NSString *)artPath {
+    return self.album.artPath;
+}
+
+#pragma mark - Model specific methods
+
+- (NSString *)artUrl {
+    return self.album.artUrl;
+}
+
+- (void)setTitle:(NSString *)_title {
+    [self setPrimitiveValue:_title forKey:@"title"];
+    [self setValue:[[_title dearticlizedString] uppercaseString] forKey:@"dearticlizedTitle"];
+}
+
+- (NSString *)index {
+    [self willAccessValueForKey:@"index"];
+    NSString *_index = [[self.title dearticlizedIndex] uppercaseString];
+    [self didAccessValueForKey:@"index"];
+    return _index;
+}
+
+- (void)setArtistId:(NSString *)_artistId {
+    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
+    NSEntityDescription *entity = [NSEntityDescription entityForName:@"Artist" inManagedObjectContext:self.managedObjectContext];
+    [fetchRequest setEntity:entity];
+    
+    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(artistId = %@)", _artistId];
+    [fetchRequest setPredicate:predicate];
+    
+    NSError *error;
+    NSArray *results = [self.managedObjectContext executeFetchRequest:fetchRequest error:&error];
+    if (error || [results count] != 1) {
+        abort();
+    }
+    
+    Artist *_artist = [results objectAtIndex:0];
+    [self setPrimitiveValue:_artist forKey:@"artist"];
+}
+
+- (NSString *)artistId {
+    return self.artist.artistId;
+}
+
+- (void)setAlbumId:(NSString *)_albumId {
+    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
+    NSEntityDescription *entity = [NSEntityDescription entityForName:@"Album" inManagedObjectContext:self.managedObjectContext];
+    [fetchRequest setEntity:entity];
+    
+    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(albumId = %@)", _albumId];
+    [fetchRequest setPredicate:predicate];
+    
+    NSError *error;
+    NSArray *results = [self.managedObjectContext executeFetchRequest:fetchRequest error:&error];
+    if (error || [results count] != 1) {
+        abort();
+    }
+    
+    Artist *_artist = [results objectAtIndex:0];
+    [self setPrimitiveValue:_artist forKey:@"album"];
+}
+
+- (NSString *)albumId {
+    return self.album.albumId;
+}
+
+- (void)setAlbumArtistId:(NSString *)_albumArtistId {
+    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
+    NSEntityDescription *entity = [NSEntityDescription entityForName:@"Artist" inManagedObjectContext:self.managedObjectContext];
+    [fetchRequest setEntity:entity];
+    
+    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(artistId = %@)", _albumArtistId];
+    [fetchRequest setPredicate:predicate];
+    
+    NSError *error;
+    NSArray *results = [self.managedObjectContext executeFetchRequest:fetchRequest error:&error];
+    if (error || [results count] != 1) {
+        abort();
+    }
+    
+    Artist *_artist = [results objectAtIndex:0];
+    [self setPrimitiveValue:_artist forKey:@"albumArtist"];
+}
+
+- (NSString *)albumArtistId {
+    return self.albumArtist.artistId;
+}
+
+/* This method exists for historical reasons currently, but should be deprecated soon. It formulates a path to send to the
+   local auth server, and that auth server then disassembles the path to get the needed info out of it. I think it'd be much
+   more efficient to just pass the song id currently.
+ */
+- (NSString *)idPath {
+	NSArray *components = [NSArray arrayWithObjects:
+						   self.artist.name,
+						   self.album.title,
+						   self.songId,
+						   nil];
+	return [NSString pathWithComponents:components];
+}
+
+@end

=== added file 'Music/Models/UOModel.h'
--- Music/Models/UOModel.h	1970-01-01 00:00:00 +0000
+++ Music/Models/UOModel.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,25 @@
+//
+//  UOModel.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/20/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <CoreData/CoreData.h>
+
+@class RKEntityMapping;
+
+@interface UOModel : NSManagedObject
++ (void)registerMapping;
++ (RKEntityMapping *)objectMapping;
++ (NSString *)keyPath;
+
+/* Not used for playlist */
+@property (nonatomic, retain) NSString *artUrl;
+
+/* Used for fetching art */
+@property (nonatomic, readonly) UIImage *art;
+- (NSString *)artPath;
+- (void)fetchArt:(void (^)(UIImage *))completionBlock;
+@end

=== added file 'Music/Models/UOModel.m'
--- Music/Models/UOModel.m	1970-01-01 00:00:00 +0000
+++ Music/Models/UOModel.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,66 @@
+//
+//  UOModel.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/20/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "UOModel.h"
+#import <RestKit/RestKit.h>
+#import "UOAppDelegate.h"
+#import "UOAuthManager.h"
+
+@implementation UOModel
+
+@dynamic artUrl;
+
++ (void)registerMapping {
+    RKObjectManager *manager = [RKObjectManager sharedManager];
+    
+    RKResponseDescriptor *responseDescriptor = [RKResponseDescriptor responseDescriptorWithMapping:[self objectMapping]
+                                                                                       pathPattern:nil
+                                                                                           keyPath:[self keyPath]
+                                                                                       statusCodes:RKStatusCodeIndexSetForClass(RKStatusCodeClassSuccessful)];
+    [manager addResponseDescriptor:responseDescriptor];
+}
+
++ (RKEntityMapping *)objectMapping {
+    RKObjectManager *manager = [RKObjectManager sharedManager];
+    
+    RKEntityMapping *mapping = [RKEntityMapping mappingForEntityForName:@"" inManagedObjectStore:manager.managedObjectStore];
+    return mapping;
+}
+
++ (NSString *)keyPath {
+    return @"";
+}
+
+- (UIImage *)art {
+    NSString *path = [self artPath];
+    if (![[NSFileManager defaultManager] fileExistsAtPath:path]) {
+        return nil;
+    }
+    return [UIImage imageWithContentsOfFile:path];
+}
+
+- (void)fetchArt:(void (^)(UIImage *))completionBlock {
+    NSOperationQueue *queue = [[UOAppDelegate delegate] queue];
+    NSString *path = [self artPath];
+    NSURLRequest *echo = [UOAuthManager oauthRequestForPath:self.artUrl];
+    NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:self.artUrl]];
+    [request setHTTPMethod:@"GET"];
+    [request addValue:[echo valueForHTTPHeaderField:@"Authorization"] forHTTPHeaderField:@"Authorization"];
+    
+    [NSURLConnection sendAsynchronousRequest:request queue:queue completionHandler:^(NSURLResponse *response, NSData *data, NSError *error) {
+        UIImage *image = [UIImage imageWithData:data];
+        [UIImageJPEGRepresentation(image, 1) writeToFile:path atomically:YES];
+        completionBlock(image);
+    }];
+}
+
+- (NSString *)artPath {
+    return nil;
+}
+
+@end

=== added file 'Music/Storyboard_iPhone.storyboard'
--- Music/Storyboard_iPhone.storyboard	1970-01-01 00:00:00 +0000
+++ Music/Storyboard_iPhone.storyboard	2013-01-24 17:06:42 +0000
@@ -0,0 +1,892 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="2844" systemVersion="12C60" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="pWo-yt-KiV">
+    <dependencies>
+        <deployment version="1280" identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1930"/>
+    </dependencies>
+    <scenes>
+        <!--Tab Bar Controller-->
+        <scene sceneID="55E-Pc-3z2">
+            <objects>
+                <tabBarController definesPresentationContext="YES" id="pWo-yt-KiV" sceneMemberID="viewController">
+                    <nil key="simulatedBottomBarMetrics"/>
+                    <simulatedScreenMetrics key="simulatedDestinationMetrics"/>
+                    <tabBar key="tabBar" contentMode="scaleToFill" id="nJQ-wP-JMb">
+                        <rect key="frame" x="129" y="330" width="163" height="49"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    </tabBar>
+                    <connections>
+                        <segue destination="4Hc-hN-hrq" kind="relationship" relationship="viewControllers" id="klJ-qc-fFf"/>
+                        <segue destination="zZR-vq-p7Z" kind="relationship" relationship="viewControllers" id="bF5-F8-6QW"/>
+                        <segue destination="o0z-jC-7D9" kind="relationship" relationship="viewControllers" id="Ewf-uJ-ZyV"/>
+                        <segue destination="LSp-29-1PS" kind="relationship" relationship="viewControllers" id="57I-h2-A9b"/>
+                        <segue destination="1UW-CE-b1Y" kind="relationship" relationship="viewControllers" id="P7v-9L-Gv7"/>
+                    </connections>
+                </tabBarController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="geL-Sh-VEU" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-25" y="1265"/>
+        </scene>
+        <!--Artists View Controller - Artists-->
+        <scene sceneID="dWt-kO-2fd">
+            <objects>
+                <tableViewController storyboardIdentifier="ArtistsViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="clT-Xi-JZg" customClass="ArtistsViewController" sceneMemberID="viewController">
+                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Ggv-lp-34h">
+                        <rect key="frame" x="0.0" y="64" width="320" height="367"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <prototypes>
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" textLabel="Wy4-11-qhh" detailTextLabel="PUO-bG-eLt" imageView="EvX-DO-a8s" style="IBUITableViewCellStyleSubtitle" id="TCk-Kb-c61" customClass="ArtistCell">
+                                <rect key="frame" x="0.0" y="22" width="320" height="44"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Wy4-11-qhh">
+                                            <rect key="frame" x="53" y="2" width="38" height="22"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                        </label>
+                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="PUO-bG-eLt">
+                                            <rect key="frame" x="53" y="24" width="47" height="18"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <color key="textColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                        </label>
+                                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="default-album-art-120.png" id="EvX-DO-a8s">
+                                            <rect key="frame" x="0.0" y="0.0" width="43" height="43"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                        </imageView>
+                                    </subviews>
+                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                </view>
+                                <connections>
+                                    <segue destination="EDS-Dj-fjS" kind="push" id="m0f-2h-dTn"/>
+                                </connections>
+                            </tableViewCell>
+                        </prototypes>
+                    </tableView>
+                    <navigationItem key="navigationItem" title="Artists" id="2F6-a9-yaC">
+                        <barButtonItem key="rightBarButtonItem" title="Now Playing" id="Czg-eS-bhH">
+                            <connections>
+                                <segue destination="hRX-A4-gMJ" kind="modal" id="jOy-gZ-ehE"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                    <connections>
+                        <outlet property="nowPlayingButton" destination="Czg-eS-bhH" id="1d7-GI-ZFe"/>
+                    </connections>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="0Gf-dy-qEu" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1047" y="-56"/>
+        </scene>
+        <!--Artist View Controller-->
+        <scene sceneID="Y3A-G3-aF2">
+            <objects>
+                <viewController storyboardIdentifier="ArtistViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="EDS-Dj-fjS" customClass="ArtistViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Uhs-fF-mn0">
+                        <rect key="frame" x="0.0" y="64" width="320" height="367"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="iCb-IM-Bgp">
+                                <rect key="frame" x="0.0" y="120" width="320" height="247"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <prototypes>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" indentationWidth="10" reuseIdentifier="Cell" textLabel="G72-IX-jh9" detailTextLabel="VIc-Rn-YXm" imageView="F2l-py-JAO" style="IBUITableViewCellStyleSubtitle" id="Y5x-0G-rno" customClass="AlbumCell">
+                                        <rect key="frame" x="0.0" y="22" width="320" height="44"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="G72-IX-jh9">
+                                                    <rect key="frame" x="53" y="2" width="38" height="22"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                </label>
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VIc-Rn-YXm">
+                                                    <rect key="frame" x="53" y="24" width="47" height="18"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <color key="textColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                </label>
+                                                <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="default-album-art-120.png" id="F2l-py-JAO">
+                                                    <rect key="frame" x="0.0" y="0.0" width="43" height="43"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                </imageView>
+                                            </subviews>
+                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                        </view>
+                                        <connections>
+                                            <segue destination="8Ya-S8-w02" kind="push" id="jMd-4K-zoU"/>
+                                        </connections>
+                                    </tableViewCell>
+                                </prototypes>
+                            </tableView>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" id="7CD-jP-Egt">
+                                <rect key="frame" x="0.0" y="0.0" width="120" height="120"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            </imageView>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Artist" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="00M-r3-Ezp">
+                                <rect key="frame" x="128" y="15" width="192" height="26"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                                <color key="shadowColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                            </label>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="6 Albums" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="25K-Tf-YSQ">
+                                <rect key="frame" x="128" y="49" width="63" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="highlightedColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="OM6-Kh-nGV">
+                        <barButtonItem key="rightBarButtonItem" title="Now Playing" id="tdG-O0-4fc">
+                            <connections>
+                                <segue destination="hRX-A4-gMJ" kind="modal" id="dlu-4W-myG"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                    <connections>
+                        <outlet property="albumArt" destination="7CD-jP-Egt" id="8PQ-jz-GxK"/>
+                        <outlet property="artistDescription" destination="25K-Tf-YSQ" id="1Zc-jA-3M0"/>
+                        <outlet property="artistName" destination="00M-r3-Ezp" id="Y9a-3a-Wat"/>
+                        <outlet property="nowPlayingButton" destination="tdG-O0-4fc" id="wcQ-K4-4i8"/>
+                        <outlet property="tableView" destination="iCb-IM-Bgp" id="vAl-VU-ljX"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Ihn-hD-5SH" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1515" y="-56"/>
+        </scene>
+        <!--Album View Controller-->
+        <scene sceneID="24B-tK-YA0">
+            <objects>
+                <viewController storyboardIdentifier="AlbumViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="8Ya-S8-w02" customClass="AlbumViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="D1T-MH-iJA">
+                        <rect key="frame" x="0.0" y="64" width="320" height="367"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="ffU-2e-oYZ">
+                                <rect key="frame" x="0.0" y="120" width="320" height="247"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <prototypes>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="Cell" textLabel="0Be-Uu-e1M" detailTextLabel="cgX-vu-iNg" imageView="xX5-x4-y65" style="IBUITableViewCellStyleSubtitle" id="vAU-q1-3Z9" customClass="SongCell">
+                                        <rect key="frame" x="0.0" y="22" width="320" height="44"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                                            <rect key="frame" x="0.0" y="0.0" width="300" height="43"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0Be-Uu-e1M">
+                                                    <rect key="frame" x="53" y="2" width="38" height="22"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                </label>
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="cgX-vu-iNg">
+                                                    <rect key="frame" x="53" y="24" width="47" height="18"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <color key="textColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                </label>
+                                                <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="default-album-art-120.png" id="xX5-x4-y65">
+                                                    <rect key="frame" x="0.0" y="0.0" width="43" height="43"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                </imageView>
+                                            </subviews>
+                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                        </view>
+                                        <connections>
+                                            <segue destination="hRX-A4-gMJ" kind="modal" identifier="SongSelectSegue" id="kr6-1e-khR"/>
+                                        </connections>
+                                    </tableViewCell>
+                                </prototypes>
+                            </tableView>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" id="1ZL-7v-l7S">
+                                <rect key="frame" x="0.0" y="0.0" width="120" height="120"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            </imageView>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Album" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dwO-gw-nTE">
+                                <rect key="frame" x="128" y="15" width="192" height="26"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                                <color key="shadowColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                            </label>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Artist" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="G01-4v-qdB">
+                                <rect key="frame" x="128" y="49" width="63" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="highlightedColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="a61-1v-dxt">
+                        <barButtonItem key="rightBarButtonItem" title="Now Playing" id="wGH-uZ-TGk">
+                            <connections>
+                                <segue destination="hRX-A4-gMJ" kind="modal" identifier="NowPlayingSegue" id="YJd-qV-EXm"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                    <connections>
+                        <outlet property="albumArt" destination="1ZL-7v-l7S" id="2Xf-yw-js8"/>
+                        <outlet property="albumDescription" destination="G01-4v-qdB" id="Pog-jn-LaT"/>
+                        <outlet property="albumTitle" destination="dwO-gw-nTE" id="ofi-52-Vcd"/>
+                        <outlet property="nowPlayingButton" destination="wGH-uZ-TGk" id="29Y-w6-iea"/>
+                        <outlet property="tableView" destination="ffU-2e-oYZ" id="hvr-96-k3y"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="UKU-A2-Ftv" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1997" y="-56"/>
+        </scene>
+        <!--Player View Controller-->
+        <scene sceneID="x1s-7w-DiN">
+            <objects>
+                <viewController storyboardIdentifier="PlayerViewController" hidesBottomBarWhenPushed="YES" useStoryboardIdentifierAsRestorationIdentifier="YES" id="hRX-A4-gMJ" customClass="PlayerViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="hdM-iJ-YAa">
+                        <rect key="frame" x="0.0" y="20" width="320" height="460"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" barStyle="blackTranslucent" id="uGB-Cu-Aav">
+                                <rect key="frame" x="0.0" y="416" width="320" height="44"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                <items>
+                                    <barButtonItem style="plain" systemItem="flexibleSpace" id="cZy-dZ-TvC"/>
+                                    <barButtonItem style="plain" systemItem="rewind" id="1xR-vh-5t6">
+                                        <connections>
+                                            <action selector="previous:" destination="hRX-A4-gMJ" id="aVK-zi-YOW"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem width="42" style="plain" systemItem="fixedSpace" id="qpi-Go-lLw"/>
+                                    <barButtonItem style="plain" systemItem="play" id="1LC-YT-al7">
+                                        <connections>
+                                            <action selector="play:" destination="hRX-A4-gMJ" id="KUH-IZ-uoJ"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem style="plain" systemItem="pause" id="DQV-3Q-HbM">
+                                        <connections>
+                                            <action selector="pause:" destination="hRX-A4-gMJ" id="2FO-Lh-W8V"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem width="42" style="plain" systemItem="fixedSpace" id="5vO-YI-vrC"/>
+                                    <barButtonItem style="plain" systemItem="fastForward" id="QEO-UP-PKx">
+                                        <connections>
+                                            <action selector="next:" destination="hRX-A4-gMJ" id="ZmL-lU-0ds"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem style="plain" systemItem="flexibleSpace" id="MBV-c6-BMY"/>
+                                </items>
+                            </toolbar>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Yam-lV-Vc9">
+                                <rect key="frame" x="0.0" y="58" width="320" height="321"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                <state key="normal" backgroundImage="default-album-art-640.png">
+                                    <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <state key="disabled" backgroundImage="default-album-art-640.png"/>
+                                <state key="selected" backgroundImage="default-album-art-640.png"/>
+                                <state key="highlighted" backgroundImage="default-album-art-640.png">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                            </button>
+                            <navigationBar contentMode="scaleToFill" barStyle="blackTranslucent" id="oeU-qV-gKe">
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                <items>
+                                    <navigationItem id="nkk-jO-edR">
+                                        <nil key="title"/>
+                                        <view key="titleView" contentMode="scaleToFill" restorationIdentifier="" id="Pu1-tL-kcl" customClass="PlayerHeaderView">
+                                            <rect key="frame" x="96" y="6" width="128" height="33"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Artist" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="h2R-82-j69">
+                                                    <rect key="frame" x="0.0" y="-6" width="128" height="21"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="12"/>
+                                                    <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Title" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="eua-we-ECS">
+                                                    <rect key="frame" x="0.0" y="12" width="128" height="21"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
+                                                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                        </view>
+                                        <barButtonItem key="rightBarButtonItem" title="Hide" id="Uea-fD-AuL">
+                                            <connections>
+                                                <action selector="hide:" destination="hRX-A4-gMJ" id="YjZ-v5-qzj"/>
+                                            </connections>
+                                        </barButtonItem>
+                                    </navigationItem>
+                                </items>
+                            </navigationBar>
+                        </subviews>
+                        <color key="backgroundColor" cocoaTouchSystemColor="darkTextColor"/>
+                    </view>
+                    <nil key="simulatedBottomBarMetrics"/>
+                    <simulatedScreenMetrics key="simulatedDestinationMetrics"/>
+                    <connections>
+                        <outlet property="albumart" destination="Yam-lV-Vc9" id="5e5-A4-rMc"/>
+                        <outlet property="artistLabel" destination="h2R-82-j69" id="Juf-cx-6ta"/>
+                        <outlet property="controlBar" destination="uGB-Cu-Aav" id="Wgb-Ct-TjW"/>
+                        <outlet property="nextButton" destination="QEO-UP-PKx" id="ZgA-sN-VU1"/>
+                        <outlet property="pauseButton" destination="DQV-3Q-HbM" id="nKw-2H-EHB"/>
+                        <outlet property="playButton" destination="1LC-YT-al7" id="2PE-Uy-AbM"/>
+                        <outlet property="previousButton" destination="1xR-vh-5t6" id="ekr-RG-Qqb"/>
+                        <outlet property="titleLabel" destination="eua-we-ECS" id="XMu-px-khb"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="ase-Pp-0S0" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1997" y="1265"/>
+        </scene>
+        <!--Navigation Controller - Artists-->
+        <scene sceneID="wAh-VA-Bcp">
+            <objects>
+                <navigationController definesPresentationContext="YES" id="4Hc-hN-hrq" sceneMemberID="viewController">
+                    <tabBarItem key="tabBarItem" title="Artists" image="artists.png" id="UKS-lS-c29"/>
+                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" barStyle="blackOpaque" prompted="NO"/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" barStyle="blackOpaque" id="bnN-Eu-OdY">
+                        <rect key="frame" x="0.0" y="0.0" width="0.0" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="clT-Xi-JZg" kind="relationship" relationship="rootViewController" id="gtU-kt-ZW0"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="dBo-wL-pzl" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="513" y="-56"/>
+        </scene>
+        <!--Albums View Controller - Albums-->
+        <scene sceneID="ZG3-yC-c5Q">
+            <objects>
+                <tableViewController storyboardIdentifier="AlbumsViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="xcy-KE-FMg" customClass="AlbumsViewController" sceneMemberID="viewController">
+                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Gt1-6s-YaG">
+                        <rect key="frame" x="0.0" y="64" width="320" height="367"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <prototypes>
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" textLabel="lHq-bS-Zm9" detailTextLabel="03B-YT-E7s" imageView="apM-jL-xHe" style="IBUITableViewCellStyleSubtitle" id="5s2-Qn-BOB" customClass="AlbumCell">
+                                <rect key="frame" x="0.0" y="22" width="320" height="44"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lHq-bS-Zm9">
+                                            <rect key="frame" x="53" y="2" width="38" height="22"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                        </label>
+                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="03B-YT-E7s">
+                                            <rect key="frame" x="53" y="24" width="47" height="18"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <color key="textColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                        </label>
+                                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="default-album-art-120.png" id="apM-jL-xHe">
+                                            <rect key="frame" x="0.0" y="0.0" width="43" height="43"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                        </imageView>
+                                    </subviews>
+                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                </view>
+                                <connections>
+                                    <segue destination="8Ya-S8-w02" kind="push" id="vss-nE-Iks"/>
+                                </connections>
+                            </tableViewCell>
+                        </prototypes>
+                    </tableView>
+                    <navigationItem key="navigationItem" title="Albums" id="hkW-z1-Fu2">
+                        <barButtonItem key="rightBarButtonItem" title="Now Playing" id="wdZ-Iw-xrr">
+                            <connections>
+                                <segue destination="hRX-A4-gMJ" kind="modal" id="VVE-Ue-HgA"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                    <connections>
+                        <outlet property="nowPlayingButton" destination="wdZ-Iw-xrr" id="QrW-J1-lC8"/>
+                    </connections>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="HV5-Sk-U9p" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1047" y="603"/>
+        </scene>
+        <!--Songs View Controller - Songs-->
+        <scene sceneID="c5e-Kz-pSi">
+            <objects>
+                <tableViewController storyboardIdentifier="SongsViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="GZ4-Ef-jEy" customClass="SongsViewController" sceneMemberID="viewController">
+                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="oMr-dT-itP">
+                        <rect key="frame" x="0.0" y="64" width="320" height="367"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <prototypes>
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" textLabel="OwY-7W-CUV" detailTextLabel="ORO-PT-T6b" imageView="Ynd-vW-pQI" style="IBUITableViewCellStyleSubtitle" id="jpK-Yt-5Y9" customClass="SongCell">
+                                <rect key="frame" x="0.0" y="22" width="320" height="44"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="OwY-7W-CUV">
+                                            <rect key="frame" x="53" y="2" width="38" height="22"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                        </label>
+                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ORO-PT-T6b">
+                                            <rect key="frame" x="53" y="24" width="47" height="18"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <color key="textColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                        </label>
+                                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="default-album-art-120.png" id="Ynd-vW-pQI">
+                                            <rect key="frame" x="0.0" y="0.0" width="43" height="43"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                        </imageView>
+                                    </subviews>
+                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                </view>
+                                <connections>
+                                    <segue destination="hRX-A4-gMJ" kind="modal" id="cRF-Ex-krh"/>
+                                </connections>
+                            </tableViewCell>
+                        </prototypes>
+                    </tableView>
+                    <navigationItem key="navigationItem" title="Songs" id="xSn-ff-tyF">
+                        <barButtonItem key="rightBarButtonItem" title="Now Playing" id="VT1-ho-rrY">
+                            <connections>
+                                <segue destination="hRX-A4-gMJ" kind="modal" id="e8X-Xp-0ra"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                    <connections>
+                        <outlet property="nowPlayingButton" destination="VT1-ho-rrY" id="Lvj-nv-Qod"/>
+                    </connections>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Ryd-Wn-8Fr" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1047" y="1265"/>
+        </scene>
+        <!--Playlists View Controller - Playlists-->
+        <scene sceneID="lYB-MX-vJE">
+            <objects>
+                <tableViewController storyboardIdentifier="PlaylistsViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="3pv-m5-N7g" customClass="PlaylistsViewController" sceneMemberID="viewController">
+                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="5h4-j3-j1b">
+                        <rect key="frame" x="0.0" y="64" width="320" height="367"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <prototypes>
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" textLabel="JsP-i0-8FD" detailTextLabel="tKX-ZD-fxt" style="IBUITableViewCellStyleSubtitle" id="B41-VB-iYU" customClass="PlaylistCell">
+                                <rect key="frame" x="0.0" y="22" width="320" height="44"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JsP-i0-8FD">
+                                            <rect key="frame" x="10" y="2" width="38" height="22"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                        </label>
+                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="tKX-ZD-fxt">
+                                            <rect key="frame" x="10" y="24" width="47" height="18"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <color key="textColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                        </label>
+                                    </subviews>
+                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                </view>
+                            </tableViewCell>
+                        </prototypes>
+                    </tableView>
+                    <navigationItem key="navigationItem" title="Playlists" id="vZb-BX-Uz8">
+                        <barButtonItem key="rightBarButtonItem" title="Now Playing" id="vcz-Uz-Uw5">
+                            <connections>
+                                <segue destination="hRX-A4-gMJ" kind="modal" id="OOo-AD-VSC"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                    <connections>
+                        <outlet property="nowPlayingButton" destination="vcz-Uz-Uw5" id="sRY-Tm-IjP"/>
+                    </connections>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Lsu-wW-VCH" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1047" y="1944"/>
+        </scene>
+        <!--Navigation Controller - Playlists-->
+        <scene sceneID="LmT-Va-mHV">
+            <objects>
+                <navigationController definesPresentationContext="YES" id="LSp-29-1PS" sceneMemberID="viewController">
+                    <tabBarItem key="tabBarItem" title="Playlists" image="playlists.png" id="MgK-Bt-XIX"/>
+                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" barStyle="blackOpaque" prompted="NO"/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" barStyle="blackOpaque" id="chg-Il-gK7">
+                        <rect key="frame" x="0.0" y="0.0" width="0.0" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="3pv-m5-N7g" kind="relationship" relationship="rootViewController" id="0Z0-Wn-amn"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Ho5-GE-ejp" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="513" y="1944"/>
+        </scene>
+        <!--Settings View Controller - Settings-->
+        <scene sceneID="zr0-a1-yay">
+            <objects>
+                <viewController storyboardIdentifier="SettingsViewController" title="Settings" useStoryboardIdentifierAsRestorationIdentifier="YES" id="1UW-CE-b1Y" customClass="SettingsViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="PeO-DV-fCR">
+                        <rect key="frame" x="0.0" y="20" width="320" height="411"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="2qY-Nn-ktN">
+                                <rect key="frame" x="64" y="68" width="193" height="44"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                <state key="normal" title="Sign out of Ubuntu One">
+                                    <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <state key="highlighted">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="deleteCredentials:" destination="1UW-CE-b1Y" eventType="touchUpInside" id="dMs-la-BSc"/>
+                                </connections>
+                            </button>
+                            <navigationBar contentMode="scaleToFill" barStyle="blackOpaque" id="fi9-Gu-y7h">
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                <items>
+                                    <navigationItem title="Settings" id="1OL-cf-ieJ">
+                                        <barButtonItem key="rightBarButtonItem" title="About" id="5t4-pZ-HZ3">
+                                            <connections>
+                                                <segue destination="XwX-yD-gmZ" kind="modal" identifier="AboutSegue" id="q67-cb-9ch"/>
+                                            </connections>
+                                        </barButtonItem>
+                                    </navigationItem>
+                                </items>
+                            </navigationBar>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                    <tabBarItem key="tabBarItem" title="Settings" image="settings.png" id="PuB-gs-lxg"/>
+                    <connections>
+                        <segue destination="iRB-yQ-1TX" kind="modal" identifier="AuthenticationSegue" id="HlT-h9-MTb"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="nwB-mO-Qdu" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="513" y="2638"/>
+        </scene>
+        <!--Settings Authentication View Controller - Log In-->
+        <scene sceneID="bJR-Ac-mSb">
+            <objects>
+                <viewController storyboardIdentifier="SettingsAuthenticationViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="iRB-yQ-1TX" customClass="SettingsAuthenticationViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="apk-8c-wHl">
+                        <rect key="frame" x="0.0" y="64" width="320" height="504"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Username" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ZEC-2H-d7Z">
+                                <rect key="frame" x="121" y="20" width="79" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Password" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="UfC-eE-bcj">
+                                <rect key="frame" x="123" y="87" width="75" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" id="waC-mM-MFm">
+                                <rect key="frame" x="20" y="116" width="280" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
+                            </textField>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" id="9eo-83-zSr">
+                                <rect key="frame" x="20" y="49" width="280" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="emailAddress" returnKeyType="next"/>
+                            </textField>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="du9-HJ-oTk">
+                                <rect key="frame" x="126" y="154" width="69" height="44"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                <state key="normal" title="Log In">
+                                    <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <state key="highlighted">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="authenticate:" destination="iRB-yQ-1TX" eventType="touchUpInside" id="Sfs-XA-OBI"/>
+                                </connections>
+                            </button>
+                            <view hidden="YES" alpha="0.70000000000000007" contentMode="scaleToFill" id="KV8-kp-weQ">
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="504"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <subviews>
+                                    <activityIndicatorView contentMode="scaleToFill" animating="YES" style="whiteLarge" id="ixc-ts-ry3">
+                                        <rect key="frame" x="142" y="233" width="37" height="37"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    </activityIndicatorView>
+                                </subviews>
+                                <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                            </view>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                    <navigationItem key="navigationItem" title="Log In" id="lZr-l9-Rd0"/>
+                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
+                    <connections>
+                        <outlet property="passwordField" destination="waC-mM-MFm" id="J4I-c0-hPj"/>
+                        <outlet property="shade" destination="KV8-kp-weQ" id="HgB-zm-dOv"/>
+                        <outlet property="spinner" destination="ixc-ts-ry3" id="Zjn-Dn-l1x"/>
+                        <outlet property="usernameField" destination="9eo-83-zSr" id="k5m-z6-dNf"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Oct-dr-Jot" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1047" y="2638"/>
+        </scene>
+        <!--Settings About View Controller - Ubuntu One Music-->
+        <scene sceneID="DCB-cK-aCY">
+            <objects>
+                <viewController storyboardIdentifier="SettingsAboutViewController" title="Ubuntu One Music" useStoryboardIdentifierAsRestorationIdentifier="YES" id="XwX-yD-gmZ" customClass="SettingsAboutViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="ezs-Zb-PEL">
+                        <rect key="frame" x="0.0" y="64" width="320" height="504"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="4sj-Hk-nsd">
+                                <rect key="frame" x="130" y="248" width="62" height="44"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                <state key="normal" title="Done">
+                                    <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <state key="highlighted">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="close:" destination="XwX-yD-gmZ" eventType="touchUpInside" id="GOR-Ec-Jnn"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                    <navigationItem key="navigationItem" title="Ubuntu One Music" id="mZO-nv-iEf">
+                        <barButtonItem key="rightBarButtonItem" title="Done" id="sDu-OP-vCU">
+                            <connections>
+                                <action selector="close:" destination="XwX-yD-gmZ" id="3kP-cf-7xQ"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Gk9-4p-GpB" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1047" y="3324"/>
+        </scene>
+        <!--Navigation Controller - Songs-->
+        <scene sceneID="H5C-K6-iJr">
+            <objects>
+                <navigationController definesPresentationContext="YES" id="o0z-jC-7D9" sceneMemberID="viewController">
+                    <tabBarItem key="tabBarItem" title="Songs" image="songs.png" id="qgg-Ad-elr"/>
+                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" barStyle="blackOpaque" prompted="NO"/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" barStyle="blackOpaque" id="8kw-rr-pbe">
+                        <rect key="frame" x="0.0" y="0.0" width="0.0" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="GZ4-Ef-jEy" kind="relationship" relationship="rootViewController" id="ic2-F6-xIN"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="M42-t1-44p" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="513" y="1265"/>
+        </scene>
+        <!--Navigation Controller - Albums-->
+        <scene sceneID="6cl-I1-xDI">
+            <objects>
+                <navigationController definesPresentationContext="YES" id="zZR-vq-p7Z" sceneMemberID="viewController">
+                    <tabBarItem key="tabBarItem" title="Albums" image="albums.png" id="lUy-zw-8Vo"/>
+                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" barStyle="blackOpaque" prompted="NO"/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" barStyle="blackOpaque" id="PP9-8N-9lk">
+                        <rect key="frame" x="0.0" y="0.0" width="0.0" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="xcy-KE-FMg" kind="relationship" relationship="rootViewController" id="qDG-ce-1Yz"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="B8o-9H-15l" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="513" y="603"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="albums.png" width="30" height="30"/>
+        <image name="artists.png" width="30" height="30"/>
+        <image name="default-album-art-120.png" width="60" height="60"/>
+        <image name="default-album-art-640.png" width="320" height="320"/>
+        <image name="playlists.png" width="30" height="30"/>
+        <image name="settings.png" width="30" height="30"/>
+        <image name="songs.png" width="30" height="30"/>
+    </resources>
+    <classes>
+        <class className="AlbumCell" superclassName="UITableViewCell">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/AlbumCell.h"/>
+        </class>
+        <class className="AlbumViewController" superclassName="SubsonicTableViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/AlbumViewController.h"/>
+            <relationships>
+                <relationship kind="outlet" name="albumArt" candidateClass="UIImageView"/>
+                <relationship kind="outlet" name="albumDescription" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="albumTitle" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="tableView" candidateClass="UITableView"/>
+            </relationships>
+        </class>
+        <class className="AlbumsViewController" superclassName="UOIndexedViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/AlbumsViewController.h"/>
+        </class>
+        <class className="ArtistCell" superclassName="UITableViewCell">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/ArtistCell.h"/>
+        </class>
+        <class className="ArtistViewController" superclassName="UIViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/ArtistViewController.h"/>
+            <relationships>
+                <relationship kind="outlet" name="albumArt" candidateClass="UIImageView"/>
+                <relationship kind="outlet" name="artistDescription" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="artistName" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="nowPlayingButton" candidateClass="UIBarButtonItem"/>
+                <relationship kind="outlet" name="tableView" candidateClass="UITableView"/>
+            </relationships>
+        </class>
+        <class className="ArtistsViewController" superclassName="UOIndexedViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/ArtistsViewController.h"/>
+        </class>
+        <class className="PlayerHeaderView" superclassName="UIView">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/PlayerHeaderView.h"/>
+            <relationships>
+                <relationship kind="outlet" name="album" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="artist" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="title" candidateClass="UILabel"/>
+            </relationships>
+        </class>
+        <class className="PlayerViewController" superclassName="UIViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/PlayerViewController.h"/>
+            <relationships>
+                <relationship kind="action" name="hide:"/>
+                <relationship kind="action" name="next:"/>
+                <relationship kind="action" name="pause:"/>
+                <relationship kind="action" name="play:"/>
+                <relationship kind="action" name="previous:"/>
+                <relationship kind="outlet" name="albumart" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="artistLabel" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="controlBar" candidateClass="UIToolbar"/>
+                <relationship kind="outlet" name="nextButton" candidateClass="UIBarButtonItem"/>
+                <relationship kind="outlet" name="pauseButton" candidateClass="UIBarButtonItem"/>
+                <relationship kind="outlet" name="playButton" candidateClass="UIBarButtonItem"/>
+                <relationship kind="outlet" name="previousButton" candidateClass="UIBarButtonItem"/>
+                <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/>
+            </relationships>
+        </class>
+        <class className="PlaylistCell" superclassName="UITableViewCell">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/PlaylistCell.h"/>
+        </class>
+        <class className="PlaylistsViewController" superclassName="UOIndexedViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/PlaylistsViewController.h"/>
+        </class>
+        <class className="SettingsAboutViewController" superclassName="UIViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/SettingsAboutViewController.h"/>
+            <relationships>
+                <relationship kind="action" name="close:"/>
+            </relationships>
+        </class>
+        <class className="SettingsAuthenticationViewController" superclassName="UIViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/SettingsAuthenticationViewController.h"/>
+            <relationships>
+                <relationship kind="action" name="authenticate:"/>
+                <relationship kind="outlet" name="passwordField" candidateClass="UITextField"/>
+                <relationship kind="outlet" name="shade" candidateClass="UIView"/>
+                <relationship kind="outlet" name="spinner" candidateClass="UIActivityIndicatorView"/>
+                <relationship kind="outlet" name="usernameField" candidateClass="UITextField"/>
+            </relationships>
+        </class>
+        <class className="SettingsViewController" superclassName="UIViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/SettingsViewController.h"/>
+            <relationships>
+                <relationship kind="action" name="deleteCredentials:"/>
+            </relationships>
+        </class>
+        <class className="SongCell" superclassName="UITableViewCell">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/SongCell.h"/>
+        </class>
+        <class className="SongsViewController" superclassName="UOIndexedViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/SongsViewController.h"/>
+        </class>
+        <class className="UOIndexedViewController" superclassName="UITableViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/UOIndexedViewController.h"/>
+            <relationships>
+                <relationship kind="outlet" name="nowPlayingButton" candidateClass="UIBarButtonItem"/>
+            </relationships>
+        </class>
+    </classes>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination" type="retina4"/>
+    </simulatedMetricsContainer>
+    <inferredMetricsTieBreakers>
+        <segue reference="VVE-Ue-HgA"/>
+        <segue reference="vss-nE-Iks"/>
+    </inferredMetricsTieBreakers>
+</document>
\ No newline at end of file

=== added file 'Music/UOAppDelegate.h'
--- Music/UOAppDelegate.h	1970-01-01 00:00:00 +0000
+++ Music/UOAppDelegate.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,28 @@
+//
+//  UOAppDelegate.h
+//  U1Music
+//
+//  Created by Paul Hummer on 1/21/13.
+//  Copyright (c) 2013 Canonical. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface UOAppDelegate : UIResponder <UIApplicationDelegate>
+
+@property (strong, nonatomic) UIWindow *window;
+
+@property (readonly, strong, nonatomic) NSManagedObjectContext *managedObjectContext;
+@property (readonly, strong, nonatomic) NSManagedObjectModel *managedObjectModel;
+@property (readonly, strong, nonatomic) NSPersistentStoreCoordinator *persistentStoreCoordinator;
+
+@property (nonatomic, retain) NSOperationQueue *queue;
+
+- (void)saveContext;
+- (NSURL *)applicationDocumentsDirectory;
+- (NSURL *)applicationCachesDirectory;
+- (NSURL *)albumArtDirectory;
+
++ (UOAppDelegate *)delegate;
+
+@end

=== added file 'Music/UOAppDelegate.m'
--- Music/UOAppDelegate.m	1970-01-01 00:00:00 +0000
+++ Music/UOAppDelegate.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,208 @@
+//
+//  UOAppDelegate.m
+//  U1Music
+//
+//  Created by Paul Hummer on 1/21/13.
+//  Copyright (c) 2013 Canonical. All rights reserved.
+//
+//  Redistribution and use in source and binary forms, with or without modification,
+//  are permitted provided that the following conditions are met:
+//
+//  * Redistributions of source code must retain the above copyright notice, this
+//    list of conditions and the following disclaimer.
+//  * Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation
+//    and/or other materials provided with the distribution.
+//  * Neither the my name nor the names of my contributors may be used to endorse
+//    or promote products derived from this software without specific prior written
+//    permission.
+//
+//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+//  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+//  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+//  SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+//  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+//  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+//  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+//  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+//  DAMAGE.
+
+#import "UOAppDelegate.h"
+#import "UOAuthManager.h"
+#import "U1LocalMusicServer.h"
+#import "StreamingPlayer.h"
+#import "Subsonic.h"
+
+#if TARGET_IPHONE_SIMULATOR
+@implementation NSURLRequest(AllowAllCerts)
++ (BOOL) allowsAnyHTTPSCertificateForHost:(NSString *)host {
+    return YES;
+}
+@end
+#endif
+
+@interface UOAppDelegate ()
+@property (readonly, strong, nonatomic) UIStoryboard *storyboard;
+@property (readonly, strong, nonatomic) U1LocalMusicServer *musicServer;
+@end
+
+@implementation UOAppDelegate
+@synthesize managedObjectContext = _managedObjectContext;
+@synthesize managedObjectModel = _managedObjectModel;
+@synthesize persistentStoreCoordinator = _persistentStoreCoordinator;
+@synthesize storyboard = _storyboard;
+@synthesize musicServer = _musicServer;
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions: (NSDictionary *)launchOptions {
+    
+    self.queue = [[NSOperationQueue alloc] init];
+    self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds ]];
+
+    /* rockstar - WTF? This should just work with the target settings. */
+    _storyboard = [UIStoryboard storyboardWithName:@"Storyboard_iPhone" bundle: nil];
+    [self.window setRootViewController:[_storyboard instantiateInitialViewController]];
+    
+    /* Set up the local music server for serving music */
+    _musicServer = [U1LocalMusicServer new];
+	[[StreamingPlayer sharedStreamingPlayer] recoverState];
+
+    [self checkAuthentication];
+    return YES;
+}
+
+- (void)applicationWillTerminate:(UIApplication *)application {
+    // Saves changes in the application's managed object context before the application terminates.
+    [self saveContext];
+}
+
+- (void)saveContext {
+    NSError *error = nil;
+    NSManagedObjectContext *managedObjectContext = self.managedObjectContext;
+    if (managedObjectContext != nil) {
+        if ([managedObjectContext hasChanges] && ![managedObjectContext save:&error]) {
+            // Replace this implementation with code to handle the error appropriately.
+            // abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it  may be useful during development.-
+            NSLog(@"Unresolved error %@, %@", error, [error userInfo]);
+            abort();
+        }
+    }
+}
+
+#pragma mark - Core Data stack
+
+// Returns the managed object context for the application.
+// If the context doesn't already exist, it is created and bound to the persistent store coordinator for the application.
+- (NSManagedObjectContext *)managedObjectContext
+{
+    if (_managedObjectContext != nil) {
+        return _managedObjectContext;
+    }
+    
+    NSPersistentStoreCoordinator *coordinator = [self persistentStoreCoordinator];
+    if (coordinator != nil) {
+        _managedObjectContext = [[NSManagedObjectContext alloc] init];
+        [_managedObjectContext setPersistentStoreCoordinator:coordinator];
+    }
+    return _managedObjectContext;
+}
+
+// Returns the managed object model for the application.
+// If the model doesn't already exist, it is created from the application's model.
+- (NSManagedObjectModel *)managedObjectModel
+{
+    if (_managedObjectModel != nil) {
+        return _managedObjectModel;
+    }
+    NSURL *modelURL = [[NSBundle mainBundle] URLForResource:@"UOMusic" withExtension:@"momd"];
+    _managedObjectModel = [[NSManagedObjectModel alloc] initWithContentsOfURL:modelURL];
+    return _managedObjectModel;
+}
+
+// Returns the persistent store coordinator for the application.
+// If the coordinator doesn't already exist, it is created and the application's store added to it.
+- (NSPersistentStoreCoordinator *)persistentStoreCoordinator
+{
+    if (_persistentStoreCoordinator != nil) {
+        return _persistentStoreCoordinator;
+    }
+    
+    NSURL *storeURL = [[self applicationDocumentsDirectory] URLByAppendingPathComponent:@"UOMusic.sqlite"];
+    
+    NSError *error = nil;
+    _persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:[self managedObjectModel]];
+    if (![_persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:storeURL options:nil error:&error]) {
+        /*
+         Replace this implementation with code to handle the error appropriately.
+         
+         abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
+         
+         Typical reasons for an error here include:
+         * The persistent store is not accessible;
+         * The schema for the persistent store is incompatible with current managed object model.
+         Check the error message to determine what the actual problem was.
+         
+         
+         If the persistent store is not accessible, there is typically something wrong with the file path. Often, a file URL is pointing into the application's resources directory instead of a writeable directory.
+         
+         If you encounter schema incompatibility errors during development, you can reduce their frequency by:
+         * Simply deleting the existing store:
+         [[NSFileManager defaultManager] removeItemAtURL:storeURL error:nil]
+         
+         * Performing automatic lightweight migration by passing the following dictionary as the options parameter:
+         @{NSMigratePersistentStoresAutomaticallyOption:@YES, NSInferMappingModelAutomaticallyOption:@YES}
+         
+         Lightweight migration will only work for a limited set of schema changes; consult "Core Data Model Versioning and Data Migration Programming Guide" for details.
+         
+         */
+        NSLog(@"Unresolved error %@, %@", error, [error userInfo]);
+        abort();
+    }
+    
+    return _persistentStoreCoordinator;
+}
+
+#pragma mark - Convenience methods
+
++ (UOAppDelegate *)delegate {
+    return (UOAppDelegate *)[UIApplication sharedApplication].delegate;
+}
+
+#pragma mark - Application's Documents directory
+
+// Returns the URL to the application's Documents directory.
+- (NSURL *)applicationDocumentsDirectory {
+    return [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] lastObject];
+}
+
+- (NSURL *)applicationCachesDirectory {
+	return [[[NSFileManager defaultManager] URLsForDirectory:NSCachesDirectory inDomains:NSUserDomainMask] lastObject];
+}
+
+- (NSURL *)albumArtDirectory {
+	NSURL *path = [[self applicationCachesDirectory] URLByAppendingPathComponent:@"albumArt"];
+    if (![[NSFileManager defaultManager] fileExistsAtPath:[path path]]) {
+        NSError *error;
+        [[NSFileManager defaultManager] createDirectoryAtPath:[path path] withIntermediateDirectories:YES attributes:nil error:&error];
+        if (error) {
+            abort();
+        }
+    }
+    return path;
+}
+
+#pragma mark - Private methods
+
+- (void)checkAuthentication {
+    if (![[UOAuthManager sharedAuthManager] hasCredentials]) {
+        UITabBarController *rootViewController = (UITabBarController *)self.window.rootViewController;
+        rootViewController.selectedIndex = 4;
+    } else {
+        [[Subsonic sharedSubsonic] setDefaultUserName:[[UOAuthManager sharedAuthManager] subsonicUsername]];
+        [[Subsonic sharedSubsonic] setDefaultPassword:[[UOAuthManager sharedAuthManager] subsonicPassword]];
+    }
+    
+    [self.window makeKeyAndVisible];
+}
+
+@end

=== added directory 'Music/UOMusic.xcdatamodeld'
=== added directory 'Music/UOMusic.xcdatamodeld/UOMusic.xcdatamodel'
=== added file 'Music/UOMusic.xcdatamodeld/UOMusic.xcdatamodel/contents'
--- Music/UOMusic.xcdatamodeld/UOMusic.xcdatamodel/contents	1970-01-01 00:00:00 +0000
+++ Music/UOMusic.xcdatamodeld/UOMusic.xcdatamodel/contents	2013-01-24 17:06:42 +0000
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model name="" userDefinedModelVersionIdentifier="UOMusic0" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="1811" systemVersion="12C60" minimumToolsVersion="Xcode 4.3" macOSVersion="Automatic" iOSVersion="Automatic">
+    <entity name="Album" representedClassName="Album" syncable="YES">
+        <attribute name="albumId" attributeType="String" indexed="YES" syncable="YES"/>
+        <attribute name="artHash" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="artUrl" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="dearticlizedTitle" attributeType="String" syncable="YES"/>
+        <attribute name="index" optional="YES" transient="YES" attributeType="String" syncable="YES"/>
+        <attribute name="title" attributeType="String" syncable="YES"/>
+        <attribute name="url" attributeType="String" syncable="YES"/>
+        <relationship name="artist" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="Artist" inverseName="albums" inverseEntity="Artist" syncable="YES"/>
+        <relationship name="songs" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Song" inverseName="album" inverseEntity="Song" syncable="YES"/>
+    </entity>
+    <entity name="Artist" representedClassName="Artist" syncable="YES">
+        <attribute name="art" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/>
+        <attribute name="artistId" attributeType="String" indexed="YES" syncable="YES"/>
+        <attribute name="artUrl" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="dearticlizedName" attributeType="String" syncable="YES"/>
+        <attribute name="index" optional="YES" transient="YES" attributeType="String" syncable="YES"/>
+        <attribute name="name" attributeType="String" syncable="YES"/>
+        <attribute name="url" attributeType="String" syncable="YES"/>
+        <relationship name="albums" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Album" inverseName="artist" inverseEntity="Album" syncable="YES"/>
+        <relationship name="songs" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Song" inverseName="albumArtist" inverseEntity="Song" syncable="YES"/>
+    </entity>
+    <entity name="Playlist" representedClassName="Playlist" syncable="YES">
+        <attribute name="dearticlizedTitle" attributeType="String" syncable="YES"/>
+        <attribute name="index" optional="YES" transient="YES" attributeType="String" syncable="YES"/>
+        <attribute name="playlistId" attributeType="String" indexed="YES" syncable="YES"/>
+        <attribute name="songCount" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
+        <attribute name="title" attributeType="String" syncable="YES"/>
+        <attribute name="url" attributeType="String" syncable="YES"/>
+    </entity>
+    <entity name="Song" representedClassName="Song" syncable="YES">
+        <attribute name="bitRate" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="contentType" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="dearticlizedTitle" attributeType="String" syncable="YES"/>
+        <attribute name="discNumber" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="duration" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="genre" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="index" optional="YES" transient="YES" attributeType="String" syncable="YES"/>
+        <attribute name="path" attributeType="String" syncable="YES"/>
+        <attribute name="size" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="songId" attributeType="String" indexed="YES" syncable="YES"/>
+        <attribute name="streamUrl" attributeType="String" syncable="YES"/>
+        <attribute name="suffix" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="title" attributeType="String" syncable="YES"/>
+        <attribute name="track" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="url" attributeType="String" syncable="YES"/>
+        <attribute name="year" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="album" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="Album" inverseName="songs" inverseEntity="Album" syncable="YES"/>
+        <relationship name="albumArtist" optional="YES" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="Artist" inverseName="songs" inverseEntity="Artist" syncable="YES"/>
+        <relationship name="artist" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="Artist" inverseName="songs" inverseEntity="Artist" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="Album" positionX="468" positionY="180" width="128" height="180"/>
+        <element name="Artist" positionX="160" positionY="195" width="128" height="180"/>
+        <element name="Playlist" positionX="160" positionY="192" width="128" height="135"/>
+        <element name="Song" positionX="160" positionY="192" width="128" height="330"/>
+    </elements>
+</model>
\ No newline at end of file

=== added directory 'Music/Utilities'
=== added file 'Music/Utilities/UOWebServiceController.h'
--- Music/Utilities/UOWebServiceController.h	1970-01-01 00:00:00 +0000
+++ Music/Utilities/UOWebServiceController.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,39 @@
+//
+//  UOWebServiceController.h
+//  U1Music
+//
+//  Created by Paul Hummer on 12/12/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <RestKit/RestKit.h>
+
+#define ALBUMS_LAST_UPDATED @"albumsLastUpdated"
+#define ARTISTS_LAST_UPDATED @"artistsLastUpdated"
+#define PLAYLISTS_LAST_UPDATED @"playlistsLastUpdated"
+#define SONGS_LAST_UPDATED @"songsLastUpdated"
+
+@protocol UOWebServiceDelegate <NSObject>
+
+- (void)webserviceUpdateComplete;
+- (void)webserviceUpdateError:(NSError *)error;
+
+@end
+
+@interface UOWebServiceController : NSObject
++ (UOWebServiceController *)controller;
+
+- (void)updateAlbums:(id<UOWebServiceDelegate>)delegate;
+- (void)updateAlbums:(id<UOWebServiceDelegate>)delegate clearCache:(BOOL)clearCache;
+
+- (void)updateArtists:(id<UOWebServiceDelegate>)delegate;
+- (void)updateArtists:(id<UOWebServiceDelegate>)delegate clearCache:(BOOL)clearCache;
+
+- (void)updatePlaylists:(id<UOWebServiceDelegate>)delegate;
+- (void)updatePlaylists:(id<UOWebServiceDelegate>)delegate clearCache:(BOOL)clearCache;
+
+- (void)updateSongs:(id<UOWebServiceDelegate>)delegate;
+- (void)updateSongs:(id<UOWebServiceDelegate>)delegate clearCache:(BOOL)clearCache;
+
+@end

=== added file 'Music/Utilities/UOWebServiceController.m'
--- Music/Utilities/UOWebServiceController.m	1970-01-01 00:00:00 +0000
+++ Music/Utilities/UOWebServiceController.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,208 @@
+//
+//  UOWebServiceController.m
+//  U1Music
+//
+//  Created by Paul Hummer on 12/12/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "UOWebServiceController.h"
+#import <RestKit/RestKit.h>
+#import <RestKit/CoreData.h>
+#import "UONetworkStatusCoordinator.h"
+#import "UOAuthManager.h"
+#import "UOAppDelegate.h"
+
+#import "Album.h"
+#import "Artist.h"
+#import "Playlist.h"
+#import "Song.h"
+
+@interface UOWebServiceController ()
+- (void)updateAlbumsWithBlock:(void(^)(void))completionBlock;
+- (void)updateArtistsWithBlock:(void(^)(void))completionBlock;
+- (void)updateSongsWithBlock:(void(^)(void))completionBlock;
+@end
+
+@implementation UOWebServiceController
+
+- (id)init {
+    self = [super init];
+    [self initRestKit];
+    return self;
+}
+
+#pragma mark - Static methods
+
++ (UOWebServiceController *)controller {
+    static UOWebServiceController *instance = nil;
+    static dispatch_once_t once;
+    dispatch_once(&once, ^{
+        instance = [[UOWebServiceController alloc] init];
+    });
+    return instance;
+}
+
+#pragma mark - Network operations
+
+- (void)updateAlbums:(id<UOWebServiceDelegate>)delegate clearCache:(BOOL)clearCache {
+    if (clearCache || [self needsUpdating:ALBUMS_LAST_UPDATED]) {
+        [self updateArtistsWithBlock:^(void) {
+            [[RKObjectManager sharedManager] getObjectsAtPath:@"albums/" parameters:nil success:^(RKObjectRequestOperation *operation, RKMappingResult *mappingResult) {
+                [delegate webserviceUpdateComplete];
+            } failure:^(RKObjectRequestOperation *operation, NSError *error) {
+                [[NSUserDefaults standardUserDefaults] setObject:nil forKey:ALBUMS_LAST_UPDATED];
+                [delegate webserviceUpdateError:error];
+            }];
+        }];
+    }
+}
+
+- (void)updateAlbums:(id<UOWebServiceDelegate>)delegate {
+    [self updateAlbums:delegate clearCache:NO];
+}
+
+- (void)updateAlbumsWithBlock:(void (^)(void))completionBlock {
+    if ([self needsUpdating:ALBUMS_LAST_UPDATED]) {
+        [self updateArtistsWithBlock:^(void) {
+            [[RKObjectManager sharedManager] getObjectsAtPath:@"albums/" parameters:nil success:^(RKObjectRequestOperation *operation, RKMappingResult *mappingResult) {
+                [[NSUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:ALBUMS_LAST_UPDATED];
+                completionBlock();
+            } failure:^(RKObjectRequestOperation *operation, NSError *error) {
+                [[NSUserDefaults standardUserDefaults] setObject:nil forKey:ALBUMS_LAST_UPDATED];
+            }];
+        }];
+    } else {
+        completionBlock();
+    }
+}
+
+- (void)updateArtists:(id<UOWebServiceDelegate>)delegate clearCache:(BOOL)clearCache {
+    if (clearCache || [self needsUpdating:ARTISTS_LAST_UPDATED]) {
+        [[RKObjectManager sharedManager] getObjectsAtPath:@"artists/" parameters:nil success:^(RKObjectRequestOperation *operation, RKMappingResult *mappingResult) {
+            [delegate webserviceUpdateComplete];
+        } failure:^(RKObjectRequestOperation *operation, NSError *error) {
+            [[NSUserDefaults standardUserDefaults] setObject:nil forKey:ARTISTS_LAST_UPDATED];
+            [delegate webserviceUpdateError:error];
+        }];
+    }
+}
+
+- (void)updateArtists:(id<UOWebServiceDelegate>)delegate {
+    [self updateArtists:delegate clearCache:NO];
+}
+
+- (void)updateArtistsWithBlock:(void(^)(void))completionBlock {
+    if ([self needsUpdating:ARTISTS_LAST_UPDATED]) {
+        [[RKObjectManager sharedManager] getObjectsAtPath:@"artists/" parameters:nil success:^(RKObjectRequestOperation *operation, RKMappingResult *mappingResult) {
+            [[NSUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:ARTISTS_LAST_UPDATED];
+            completionBlock();
+        } failure:^(RKObjectRequestOperation *operation, NSError *error) {
+            [[NSUserDefaults standardUserDefaults] setObject:nil forKey:ARTISTS_LAST_UPDATED];
+        }];
+    } else {
+        completionBlock();
+    }
+}
+
+- (void)updatePlaylists:(id<UOWebServiceDelegate>)delegate clearCache:(BOOL)clearCache {
+    if (clearCache || [self needsUpdating:PLAYLISTS_LAST_UPDATED]) {
+        [self updateSongsWithBlock:^(void) {
+            [[RKObjectManager sharedManager] getObjectsAtPath:@"playlists/" parameters:nil success:^(RKObjectRequestOperation *operation, RKMappingResult *mappingResult) {
+                [delegate webserviceUpdateComplete];
+            } failure:^(RKObjectRequestOperation *operation, NSError *error) {
+                [[NSUserDefaults standardUserDefaults] setObject:nil forKey:PLAYLISTS_LAST_UPDATED];
+                [delegate webserviceUpdateError:error];
+            }];
+        }];
+    }
+}
+
+- (void)updatePlaylists:(id<UOWebServiceDelegate>)delegate {
+    [self updatePlaylists:delegate clearCache:NO];
+}
+
+- (void)updateSongs:(id<UOWebServiceDelegate>)delegate clearCache:(BOOL)clearCache {
+    if (clearCache || [self needsUpdating:SONGS_LAST_UPDATED]) {
+        [self updateAlbumsWithBlock:^(void) {
+            [[RKObjectManager sharedManager] getObjectsAtPath:@"songs/" parameters:nil success:^(RKObjectRequestOperation *operation, RKMappingResult *mappingResult) {
+                [delegate webserviceUpdateComplete];
+            } failure:^(RKObjectRequestOperation *operation, NSError *error) {
+                [[NSUserDefaults standardUserDefaults] setObject:nil forKey:SONGS_LAST_UPDATED];
+                [delegate webserviceUpdateError:error];
+            }];
+        }];
+    }
+}
+
+- (void)updateSongs:(id<UOWebServiceDelegate>)delegate {
+    [self updateSongs:delegate clearCache:NO];
+}
+
+- (void)updateSongsWithBlock:(void (^)(void))completionBlock {
+    if ([self needsUpdating:SONGS_LAST_UPDATED]) {
+        [self updateAlbumsWithBlock:^(void) {
+            [[RKObjectManager sharedManager] getObjectsAtPath:@"songs/" parameters:nil success:^(RKObjectRequestOperation *operation, RKMappingResult *mappingResult) {
+                [[NSUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:SONGS_LAST_UPDATED];
+                completionBlock();
+            } failure:^(RKObjectRequestOperation *operation, NSError *error) {
+                [[NSUserDefaults standardUserDefaults] setObject:nil forKey:SONGS_LAST_UPDATED];
+            }];
+        }];
+    } else {
+        completionBlock();
+    }
+}
+
+#pragma mark - Private methods
+
+- (BOOL)needsUpdating:(NSString *)key {
+    int interval = -(60*60*24*5); // 5 days ago
+    NSDate *freshInterval = [NSDate dateWithTimeIntervalSinceNow:interval];
+    NSDate *lastUpdatedAt = [[NSUserDefaults standardUserDefaults] objectForKey:key];
+        
+    BOOL updateNeeded = (lastUpdatedAt == nil || [freshInterval compare:lastUpdatedAt] == NSOrderedDescending);
+    if (updateNeeded) {
+        [[NSUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:key];
+    }
+    return updateNeeded;
+}
+
+- (void)initRestKit {
+    RKLogConfigureByName("RestKit/Network", RKLogLevelWarning);
+    
+    NSURL *baseUrl = [NSURL URLWithString:@"https://one.ubuntu.com/api/music/v2/"];
+    RKObjectManager *objectManager = [RKObjectManager managerWithBaseURL:baseUrl];
+    
+    /* Handle Plaintext auth */
+    NSURLRequest *echo = [UOAuthManager oauthRequestForPath:[baseUrl path]];
+    [objectManager.HTTPClient setDefaultHeader:@"Authorization" value:[echo valueForHTTPHeaderField:@"Authorization"]];
+    [objectManager.HTTPClient setDefaultHeader:@"Accept-Encoding" value:[echo valueForHTTPHeaderField:@"Accept-Encoding"]];
+    [objectManager.HTTPClient setDefaultHeader:@"User-Agent" value:[echo valueForHTTPHeaderField:@"User-Agent"]];
+    
+    /* Show animated network I/O indicator when doing network I/O */
+    [[AFNetworkActivityIndicatorManager sharedManager] setEnabled:YES];
+    
+    /* Set up managed object store */
+    NSManagedObjectModel *managedObjectModel = [[UOAppDelegate delegate] managedObjectModel];
+    RKManagedObjectStore *managedObjectStore = [[RKManagedObjectStore alloc] initWithManagedObjectModel:managedObjectModel];
+    
+    /* Why the hell is RestKit not smart enough to do this automatically? Annoy. */
+    NSError *error;
+    [managedObjectStore addSQLitePersistentStoreAtPath:[RKApplicationDataDirectory() stringByAppendingPathComponent:@"UOMusic.sqlite"] fromSeedDatabaseAtPath:nil withConfiguration:nil options:nil error:&error];
+    if (error) {
+        NSLog(@"Database model is out of date");
+        abort();
+    }
+    [objectManager setManagedObjectStore:managedObjectStore];
+    [managedObjectStore createManagedObjectContexts];
+
+    [Album registerMapping];
+    [Artist registerMapping];
+    [Playlist registerMapping];
+    [Song registerMapping];
+    
+    [RKMIMETypeSerialization registerClass:[RKNSJSONSerialization class] forMIMEType:@"application/json"];
+}
+
+@end

=== added directory 'Music/View Controllers'
=== added file 'Music/View Controllers/AlbumViewController.h'
--- Music/View Controllers/AlbumViewController.h	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/AlbumViewController.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,17 @@
+//
+//  AlbumViewController.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/15/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@class Album;
+
+@interface AlbumViewController : UIViewController
+@property (nonatomic, retain) NSString *albumId;
+
+@property (strong, nonatomic) IBOutlet UIBarButtonItem *nowPlayingButton;
+@end

=== added file 'Music/View Controllers/AlbumViewController.m'
--- Music/View Controllers/AlbumViewController.m	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/AlbumViewController.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,149 @@
+//
+//  AlbumViewController.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/15/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "AlbumViewController.h"
+#import "Album.h"
+#import <RestKit/RestKit.h>
+#import "SongCell.h"
+#import "Song.h"
+#import "UOWebServiceController.h"
+
+#import "StreamingPlayer.h"
+
+@interface AlbumViewController () <UITableViewDataSource, UOWebServiceDelegate> {
+    NSArray *tableData;
+    
+    Album *album;
+}
+@property (weak, nonatomic) IBOutlet UIImageView *albumArt;
+@property (weak, nonatomic) IBOutlet UILabel *albumTitle;
+@property (weak, nonatomic) IBOutlet UILabel *albumDescription;
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+
+@end
+
+@implementation AlbumViewController
+@synthesize albumId = _albumId;
+
+- (void)viewDidLoad {
+    [self.tableView setDataSource:self];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+    [self fetchAlbum];
+    
+    if (![[StreamingPlayer sharedStreamingPlayer] currentSong]) {
+        self.navigationItem.rightBarButtonItem = nil;
+    } else {
+        self.navigationItem.rightBarButtonItem = self.nowPlayingButton;
+    }
+    
+    [_albumTitle setText:album.title];
+    [_albumDescription setText:album.artist.name];
+    if (!album.art) {
+        [album fetchArt:^(UIImage *image) {
+            [self.albumArt setImage:image];
+            [self.albumArt setNeedsDisplay];
+        }];
+    } else {
+        [self.albumArt setImage:album.art];
+    }
+    
+    if ([album.songs count]) {
+        NSArray *sortDescriptors = [NSArray arrayWithObjects:[[NSSortDescriptor alloc] initWithKey:@"track" ascending:NO], nil];
+        tableData = [album.songs sortedArrayUsingDescriptors:sortDescriptors];
+        [self.tableView reloadData];
+    } else {
+        [[UOWebServiceController controller] updateSongs:self];
+    }
+}
+
+- (void)viewDidUnload {
+    [self setAlbumArt:nil];
+    [self setAlbumTitle:nil];
+    [self setAlbumDescription:nil];
+    [self setTableView:nil];
+    [self setNowPlayingButton:nil];
+    [super viewDidUnload];
+}
+
+#pragma mark - UITableViewDelegate methods
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return [tableData count];
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    static NSString *CellIndentifier = @"Cell";
+    SongCell *cell = [self.tableView dequeueReusableCellWithIdentifier:CellIndentifier forIndexPath:indexPath];
+    Song *song = [tableData objectAtIndex:indexPath.row];
+    [cell setSong:song];
+    return cell;
+}
+
+#pragma mark - Private methods
+
+- (void)fetchAlbum {
+    NSManagedObjectContext *managedObjectContext = [[[RKObjectManager sharedManager] managedObjectStore] persistentStoreManagedObjectContext];
+    
+    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
+    NSEntityDescription *entity = [NSEntityDescription entityForName:@"Album" inManagedObjectContext:managedObjectContext];
+    [fetchRequest setEntity:entity];
+    
+    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(albumId = %@)", _albumId];
+    [fetchRequest setPredicate:predicate];
+    
+    NSError *error;
+    NSArray *results = [managedObjectContext executeFetchRequest:fetchRequest error:&error];
+    if (error || [results count] != 1) {
+        abort();
+    }
+    album = [results objectAtIndex:0];
+}
+
+#pragma mark - UOWebServiceDelegate methods
+
+- (void)webserviceUpdateComplete {
+    NSManagedObjectContext *managedObjectContext = [[[RKObjectManager sharedManager] managedObjectStore] persistentStoreManagedObjectContext];
+    [managedObjectContext refreshObject:album mergeChanges:NO];
+    
+    NSArray *sortDescriptors = [NSArray arrayWithObjects:[[NSSortDescriptor alloc] initWithKey:@"dearticlizedTitle" ascending:YES], nil];
+    tableData = [album.songs sortedArrayUsingDescriptors:sortDescriptors];
+    
+    [self.tableView reloadData];
+}
+
+- (void)webserviceUpdateError:(NSError *)error {
+    if ([error code] == 2) { // Network is down.
+        return;
+    }
+    NSLog(@"Error: %@", [error localizedDescription]);
+}
+
+#pragma mark - Storyboard methods
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    NSArray *songs = [tableData copy];
+    if (![sender respondsToSelector:@selector(song)]) {
+        return; // Hit 'Now Playing'
+    }
+    Song *song = ((SongCell *)sender).song;
+    
+    StreamingPlayer *player = [StreamingPlayer sharedStreamingPlayer];
+    player.currentSong = song;
+    player.currentPlaylist = songs;
+    player.isNewSong = YES;
+    player.isShuffle = NO;
+    
+    if (player.streamer) {
+        [player.streamer stop];
+    }
+    [player playPauseSong];
+}
+
+@end

=== added file 'Music/View Controllers/AlbumsViewController.h'
--- Music/View Controllers/AlbumsViewController.h	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/AlbumsViewController.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,12 @@
+//
+//  AlbumsViewController.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/15/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "UOIndexedViewController.h"
+
+@interface AlbumsViewController : UOIndexedViewController
+@end

=== added file 'Music/View Controllers/AlbumsViewController.m'
--- Music/View Controllers/AlbumsViewController.m	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/AlbumsViewController.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,60 @@
+//
+//  AlbumsViewController.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/15/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "AlbumsViewController.h"
+#import "UONetworkStatusCoordinator.h"
+#import "NSString+Extras.h"
+#import "Album.h"
+#import "AlbumCell.h"
+#import "AlbumViewController.h"
+#import "UOWebServiceController.h"
+
+@interface AlbumsViewController ()
+
+@end
+
+@implementation AlbumsViewController
+
+#pragma mark - UOIndexedViewControllers methods
+
+- (void)configureCell:(UITableViewCell *)cell forIndexPath:(NSIndexPath *)indexPath {
+    Album *album = [self.fetchedResultsController objectAtIndexPath:indexPath];
+    AlbumCell *albumCell = (AlbumCell *)cell;
+    [albumCell setAlbum:album];
+}
+
+- (NSString *)entityName {
+    return @"Album";
+}
+
+- (NSString *)lastUpdatedKey {
+    return ALBUMS_LAST_UPDATED;
+}
+
+- (NSArray *)sortDescriptors {
+    return [NSArray arrayWithObjects:
+            [[NSSortDescriptor alloc] initWithKey:@"dearticlizedTitle" ascending:YES],
+            nil];
+}
+
+- (void)update {
+    [[UOWebServiceController controller] updateAlbums:self];
+}
+
+#pragma mark - Storyboard methods
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    if (![sender respondsToSelector:@selector(album)]) {
+        return; // Hit 'Now Playing'
+    }
+    AlbumViewController *albumViewController = [segue destinationViewController];
+    Album *album = ((AlbumCell *)sender).album;
+    albumViewController.albumId = album.albumId;
+}
+
+@end

=== added file 'Music/View Controllers/ArtistViewController.h'
--- Music/View Controllers/ArtistViewController.h	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/ArtistViewController.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,17 @@
+//
+//  ArtistViewController.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/15/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@class Artist;
+
+@interface ArtistViewController : UIViewController
+@property (nonatomic, retain) NSString *artistId;
+
+@property (strong, nonatomic) IBOutlet UIBarButtonItem *nowPlayingButton;
+@end

=== added file 'Music/View Controllers/ArtistViewController.m'
--- Music/View Controllers/ArtistViewController.m	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/ArtistViewController.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,140 @@
+//
+//  ArtistViewController.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/15/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "ArtistViewController.h"
+#import "UONetworkStatusCoordinator.h"
+#import <RestKit/RestKit.h>
+
+#import "Artist.h"
+#import "Album.h"
+#import "AlbumCell.h"
+#import "AlbumViewController.h"
+#import "UOWebServiceController.h"
+#import "UOAppDelegate.h"
+#import "StreamingPlayer.h"
+
+@interface ArtistViewController () <UITableViewDataSource, UOWebServiceDelegate> {
+    NSArray *tableData;
+    
+    Artist *artist;
+}
+@property (weak, nonatomic) IBOutlet UIImageView *albumArt;
+@property (weak, nonatomic) IBOutlet UILabel *artistName;
+@property (weak, nonatomic) IBOutlet UILabel *artistDescription;
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+
+@end
+
+@implementation ArtistViewController
+@synthesize artistId = _artistId;
+
+- (void)viewDidLoad {
+    [self.tableView setDataSource:self];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+    [[UOWebServiceController controller] updateAlbums:self];
+    [self fetchArtist];
+    
+    [_artistName setText:artist.name];
+    if (!artist.art) {
+        [artist fetchArt:^(UIImage *image) {
+            [self.albumArt setImage:image];
+            [self.albumArt setNeedsDisplay];
+        }];
+    } else {
+        [self.albumArt setImage:artist.art];
+    }
+    
+    if (![[StreamingPlayer sharedStreamingPlayer] currentSong]) {
+        self.navigationItem.rightBarButtonItem = nil;
+    } else {
+        self.navigationItem.rightBarButtonItem = self.nowPlayingButton;
+    }
+    
+    NSString *pluralizedNoun = @"albums";
+    if ([artist.albums count] == 1) {
+        pluralizedNoun = @"album";
+    }
+    [_artistDescription setText:[NSString stringWithFormat:@"%d %@", [artist.albums count], pluralizedNoun]];
+    NSArray *sortDescriptors = [NSArray arrayWithObjects:[[NSSortDescriptor alloc] initWithKey:@"dearticlizedTitle" ascending:YES], nil];
+    tableData = [artist.albums sortedArrayUsingDescriptors:sortDescriptors];
+    [self.tableView reloadData];
+}
+
+- (void)viewDidUnload {
+    [self setAlbumArt:nil];
+    [self setArtistName:nil];
+    [self setArtistDescription:nil];
+    [self setTableView:nil];
+    [super viewDidUnload];
+}
+
+#pragma mark - UITableViewDelegate methods
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return [tableData count];
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    static NSString *CellIndentifier = @"Cell";
+    AlbumCell *cell = [self.tableView dequeueReusableCellWithIdentifier:CellIndentifier forIndexPath:indexPath];
+    Album *album = [tableData objectAtIndex:indexPath.row];
+    [cell setAlbum:album];
+    return cell;
+}
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    if (![sender respondsToSelector:@selector(album)]) {
+        return; // Hit 'Now Playing'
+    }
+    AlbumViewController *albumViewController = [segue destinationViewController];
+    Album *album = ((AlbumCell *)sender).album;
+    albumViewController.albumId = album.albumId;
+}
+
+#pragma mark - UOWebServiceDelegate methods
+
+- (void)webserviceUpdateComplete {
+    NSManagedObjectContext *managedObjectContext = [[[RKObjectManager sharedManager] managedObjectStore] persistentStoreManagedObjectContext];
+    [managedObjectContext refreshObject:artist mergeChanges:NO];
+
+    NSArray *sortDescriptors = [NSArray arrayWithObjects:[[NSSortDescriptor alloc] initWithKey:@"dearticlizedTitle" ascending:YES], nil];
+    tableData = [artist.albums sortedArrayUsingDescriptors:sortDescriptors];
+    
+    [self.tableView reloadData];
+}
+
+- (void)webserviceUpdateError:(NSError *)error {
+    if ([error code] == 2) { // Network is down.
+        return;
+    }
+    NSLog(@"Error: %@", [error localizedDescription]);
+}
+
+#pragma mark - Private methods
+
+- (void)fetchArtist {
+    NSManagedObjectContext *managedObjectContext = [[[RKObjectManager sharedManager] managedObjectStore] persistentStoreManagedObjectContext];
+    
+    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
+    NSEntityDescription *entity = [NSEntityDescription entityForName:@"Artist" inManagedObjectContext:managedObjectContext];
+    [fetchRequest setEntity:entity];
+    
+    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(artistId = %@)", _artistId];
+    [fetchRequest setPredicate:predicate];
+    
+    NSError *error;
+    NSArray *results = [managedObjectContext executeFetchRequest:fetchRequest error:&error];
+    if (error || [results count] != 1) {
+        abort();
+    }
+    artist = [results objectAtIndex:0];
+}
+
+@end

=== added file 'Music/View Controllers/ArtistsViewController.h'
--- Music/View Controllers/ArtistsViewController.h	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/ArtistsViewController.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,12 @@
+//
+//  ArtistsViewController.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/15/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "UOIndexedViewController.h"
+
+@interface ArtistsViewController : UOIndexedViewController
+@end

=== added file 'Music/View Controllers/ArtistsViewController.m'
--- Music/View Controllers/ArtistsViewController.m	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/ArtistsViewController.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,64 @@
+//
+//  ArtistsViewController.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/15/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "ArtistsViewController.h"
+#import <RestKit/RestKit.h>
+#import "NSString+Extras.h"
+
+#import "Artist.h"
+#import "ArtistCell.h"
+
+#import "UONetworkStatusCoordinator.h"
+#import "ArtistViewController.h"
+#import "UOWebServiceController.h"
+
+@interface ArtistsViewController ()
+@end
+
+@implementation ArtistsViewController
+
+#pragma mark - UOIndexedViewController methods
+
+- (void)configureCell:(UITableViewCell *)cell forIndexPath:(NSIndexPath *)indexPath {
+    Artist *artist = [self.fetchedResultsController objectAtIndexPath:indexPath];
+    ArtistCell *artistCell = (ArtistCell *)cell;
+    
+    [artistCell setArtist:artist];
+}
+
+- (NSString *)entityName {
+    return @"Artist";
+}
+
+- (NSString *)lastUpdatedKey {
+return ARTISTS_LAST_UPDATED;
+}
+
+- (NSArray *)sortDescriptors {
+    return [NSArray arrayWithObjects:
+            [[NSSortDescriptor alloc] initWithKey:@"dearticlizedName" ascending:YES],
+            nil];
+}
+
+- (void)update {
+    [[UOWebServiceController controller] updateArtists:self];
+}
+
+#pragma mark - Storyboard methods
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    if (![sender respondsToSelector:@selector(artist)]) {
+        return; // Hit 'Now Playing'
+    }
+    
+    ArtistViewController *artistViewController = [segue destinationViewController];
+    Artist *artist = ((ArtistCell *)sender).artist;    
+    artistViewController.artistId = artist.artistId;
+}
+
+@end

=== added file 'Music/View Controllers/PlayerViewController.h'
--- Music/View Controllers/PlayerViewController.h	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/PlayerViewController.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,31 @@
+//
+//  PlayerViewController.h
+//  U1Music
+//
+//  Created by Paul Hummer on 1/14/13.
+//  Copyright (c) 2013 Canonical. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface PlayerViewController : UIViewController
+
+
+@property (weak, nonatomic) IBOutlet UIToolbar *controlBar;
+
+@property (weak, nonatomic) IBOutlet UIButton *albumart;
+@property (weak, nonatomic) IBOutlet UIBarButtonItem *previousButton;
+@property (strong, nonatomic) IBOutlet UIBarButtonItem *playButton;
+@property (strong, nonatomic) IBOutlet UIBarButtonItem *pauseButton;
+@property (weak, nonatomic) IBOutlet UIBarButtonItem *nextButton;
+
+- (IBAction)hide:(id)sender;
+
+- (IBAction)previous:(id)sender;
+- (IBAction)play:(id)sender;
+- (IBAction)pause:(id)sender;
+- (IBAction)next:(id)sender;
+
+@property (weak, nonatomic) IBOutlet UILabel *artistLabel;
+@property (weak, nonatomic) IBOutlet UILabel *titleLabel;
+@end

=== added file 'Music/View Controllers/PlayerViewController.m'
--- Music/View Controllers/PlayerViewController.m	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/PlayerViewController.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,118 @@
+//
+//  PlayerViewController.m
+//  U1Music
+//
+//  Created by Paul Hummer on 1/14/13.
+//  Copyright (c) 2013 Canonical. All rights reserved.
+//
+
+#import "PlayerViewController.h"
+#import "Song.h"
+#import "Artist.h"
+#import "Album.h"
+
+#import "StreamingPlayer.h"
+
+@interface PlayerViewController ()
+
+@end
+
+@implementation PlayerViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    NSMutableArray *controlItems = [[self.controlBar items] mutableCopy];
+    [controlItems removeObjectAtIndex:[controlItems indexOfObject:self.pauseButton]];
+    [self.controlBar setItems:controlItems];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    [[StreamingPlayer sharedStreamingPlayer] addObserver:self forKeyPath:@"currentSong" options:0 context:NULL];
+    [[StreamingPlayer sharedStreamingPlayer] addObserver:self forKeyPath:@"isPlaying" options:0 context:NULL];
+    
+    [self updatePlayPause];
+    [self updateCurrentSong];
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+    [super viewWillDisappear:animated];
+    
+    [[StreamingPlayer sharedStreamingPlayer] removeObserver:self forKeyPath:@"currentSong"];
+    [[StreamingPlayer sharedStreamingPlayer] removeObserver:self forKeyPath:@"isPlaying"];
+}
+
+- (void)viewDidUnload {
+    [self setAlbumart:nil];
+    [self setPreviousButton:nil];
+    [self setPlayButton:nil];
+    [self setPauseButton:nil];
+    [self setNextButton:nil];
+    [self setControlBar:nil];
+    [self setArtistLabel:nil];
+    [self setTitleLabel:nil];
+    [super viewDidUnload];
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
+	if ([keyPath isEqual:@"currentSong"]) {
+		[self updateCurrentSong];
+	} else if ([keyPath isEqual:@"isPlaying"]) {
+		[self updatePlayPause];
+	}
+}
+
+#pragma mark - IBAction methods
+
+- (IBAction)hide:(id)sender {
+    [self dismissModalViewControllerAnimated:YES];
+}
+
+- (IBAction)previous:(id)sender {
+    [[StreamingPlayer sharedStreamingPlayer] prevSong];
+}
+
+- (IBAction)play:(id)sender {
+    [[StreamingPlayer sharedStreamingPlayer] playPauseSong];
+    [self updatePlayPause];
+}
+
+- (IBAction)next:(id)sender {
+    [[StreamingPlayer sharedStreamingPlayer] nextSong];
+}
+
+- (IBAction)pause:(id)sender {
+    [[StreamingPlayer sharedStreamingPlayer] playPauseSong];
+    [self updatePlayPause];
+}
+
+#pragma mark - Private methods
+
+- (void)updatePlayPause {
+    NSMutableArray *controlItems = [[self.controlBar items] mutableCopy];
+    if ([[StreamingPlayer sharedStreamingPlayer] isPlaying]) {
+        if ([controlItems containsObject:self.playButton]) {
+            NSInteger index = [controlItems indexOfObject:self.playButton];
+            [controlItems removeObjectAtIndex:index];
+            [controlItems insertObject:self.pauseButton atIndex:index];
+            [self.controlBar setItems:controlItems];
+        }
+    } else {
+        if ([controlItems containsObject:self.pauseButton]) {
+            NSInteger index = [controlItems indexOfObject:self.pauseButton];
+            [controlItems removeObjectAtIndex:index];
+            [controlItems insertObject:self.playButton atIndex:index];
+            [self.controlBar setItems:controlItems];
+        }
+    }
+}
+
+- (void)updateCurrentSong {
+    Song *song = [StreamingPlayer sharedStreamingPlayer].currentSong;
+    [self.artistLabel setText:song.artist.name];
+    [self.titleLabel setText:song.title];
+    
+    [self.albumart setImage:song.art forState:UIControlStateNormal];
+}
+
+@end

=== added file 'Music/View Controllers/PlaylistsViewController.h'
--- Music/View Controllers/PlaylistsViewController.h	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/PlaylistsViewController.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,12 @@
+//
+//  PlaylistsViewController.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/15/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "UOIndexedViewController.h"
+
+@interface PlaylistsViewController : UOIndexedViewController
+@end

=== added file 'Music/View Controllers/PlaylistsViewController.m'
--- Music/View Controllers/PlaylistsViewController.m	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/PlaylistsViewController.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,48 @@
+//
+//  PlaylistsViewController.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/15/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "PlaylistsViewController.h"
+#import "UONetworkStatusCoordinator.h"
+#import "Playlist.h"
+#import "PlaylistCell.h"
+#import "NSString+Extras.h"
+#import "UOWebServiceController.h"
+
+@interface PlaylistsViewController ()
+
+@end
+
+@implementation PlaylistsViewController
+
+#pragma mark - UOIndexedViewController methods
+
+- (void)configureCell:(UITableViewCell *)cell forIndexPath:(NSIndexPath *)indexPath {
+    PlaylistCell *playlistCell = (PlaylistCell *)cell;
+    Playlist *playlist = [self.fetchedResultsController objectAtIndexPath:indexPath];
+    [playlistCell setPlaylist:playlist];
+}
+
+- (NSString *)entityName {
+    return @"Playlist";
+}
+
+- (NSString *)lastUpdatedKey {
+    return PLAYLISTS_LAST_UPDATED;
+}
+
+- (NSArray *)sortDescriptors {
+    return [NSArray arrayWithObjects:
+            [[NSSortDescriptor alloc] initWithKey:@"dearticlizedTitle" ascending:YES],
+            nil];
+}
+
+- (void)update {
+    [[UOWebServiceController controller] updatePlaylists:self];
+}
+
+@end

=== added file 'Music/View Controllers/SettingsAboutViewController.h'
--- Music/View Controllers/SettingsAboutViewController.h	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/SettingsAboutViewController.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,13 @@
+//
+//  SettingsAboutViewController.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/16/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface SettingsAboutViewController : UIViewController
+
+@end

=== added file 'Music/View Controllers/SettingsAboutViewController.m'
--- Music/View Controllers/SettingsAboutViewController.m	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/SettingsAboutViewController.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,42 @@
+//
+//  SettingsAboutViewController.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/16/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "SettingsAboutViewController.h"
+
+@interface SettingsAboutViewController ()
+- (IBAction)close:(id)sender;
+
+@end
+
+@implementation SettingsAboutViewController
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+	// Do any additional setup after loading the view.
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)close:(id)sender {
+    [self dismissModalViewControllerAnimated:YES];
+}
+@end

=== added file 'Music/View Controllers/SettingsAuthenticationViewController.h'
--- Music/View Controllers/SettingsAuthenticationViewController.h	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/SettingsAuthenticationViewController.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,13 @@
+//
+//  SettingsAuthenticationViewController.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/16/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface SettingsAuthenticationViewController : UIViewController
+
+@end

=== added file 'Music/View Controllers/SettingsAuthenticationViewController.m'
--- Music/View Controllers/SettingsAuthenticationViewController.m	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/SettingsAuthenticationViewController.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,117 @@
+//
+//  SettingsAuthenticationViewController.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/16/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "SettingsAuthenticationViewController.h"
+#import "UOAuthManager.h"
+#import "Subsonic.h"
+
+@interface SettingsAuthenticationViewController () <UOAuthManagerDelegate>
+@property (weak, nonatomic) IBOutlet UITextField *usernameField;
+@property (weak, nonatomic) IBOutlet UITextField *passwordField;
+
+/* XXX: rockstar - spinner should really be a childe of shade. */
+@property (weak, nonatomic) IBOutlet UIView *shade;
+@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *spinner;
+
+- (IBAction)authenticate:(id)sender;
+@end
+
+@implementation SettingsAuthenticationViewController
+@synthesize usernameField = _usernameField;
+@synthesize passwordField = _passwordField;
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+	// Do any additional setup after loading the view.
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+- (void)viewDidUnload {
+    [self setUsernameField:nil];
+    [self setPasswordField:nil];
+    [self setShade:nil];
+    [self setSpinner:nil];
+    [super viewDidUnload];
+}
+
+#pragma mark - Actions
+
+- (IBAction)authenticate:(id)sender {
+    NSString *username = _usernameField.text;
+    NSString *password = _passwordField.text;
+    
+    [self.view endEditing:YES];
+    
+    [self.shade setHidden:NO];
+    [self.spinner setHidden:NO];
+    
+    NSString *tokenName = [NSString stringWithFormat:@"Ubuntu One @ %@", [[UIDevice currentDevice] name]];
+    [[UOAuthManager sharedAuthManager] loginWithUsername:username andPassword:password tokenName:tokenName delegate:self];
+}
+
+#pragma mark - UOAuthManagerDelegate methods
+
+- (void)authenticationSuccess {
+    /* XXX: rockstar - As soon as we no longer use Subsonic credentials for streaming, this can be dropped/simplified. */
+    id subsonicCompletionBlock = ^(NSString *username) {
+        [[Subsonic sharedSubsonic] setDefaultUserName:[[UOAuthManager sharedAuthManager] subsonicUsername]];
+        [[Subsonic sharedSubsonic] setDefaultPassword:[[UOAuthManager sharedAuthManager] subsonicPassword]];
+
+        [self.shade setHidden:YES];
+        [self.spinner setHidden:YES];
+        
+        [self dismissModalViewControllerAnimated:YES];
+    };
+    id subsonicErrorBlock = ^(NSError *error) {
+        NSLog(@"Could not retrieve subsonic credentials");
+    };
+    [[UOAuthManager sharedAuthManager] fetchSubsonicCredentials:subsonicCompletionBlock errorBlock:subsonicErrorBlock];
+}
+
+-(void)authenticationError:(NSError *)error {
+    if (error.code == 401) {
+        [_passwordField setText:@""];
+        [self showAlert:@"Invalid username and password"];
+    } else if (error.code == 0) {
+        /* XXX: rockstar - This is too clever. It should really only retry once or twice. */
+        [self authenticate:nil];
+    } else {
+        [self showAlert:@"An error has ocurred. Please try again."];
+    }
+    
+    [self.shade setHidden:YES];
+    [self.spinner setHidden:YES];
+}
+
+#pragma mark - Private methods
+
+- (void)showAlert:(NSString *)message {
+    UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Error logging in"
+                                                    message:message
+                                                   delegate:nil
+                                          cancelButtonTitle:@"OK"
+                                          otherButtonTitles:nil];
+    [alert show];
+}
+
+@end

=== added file 'Music/View Controllers/SettingsViewController.h'
--- Music/View Controllers/SettingsViewController.h	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/SettingsViewController.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,13 @@
+//
+//  SettingsViewController.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/15/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface SettingsViewController : UIViewController
+
+@end

=== added file 'Music/View Controllers/SettingsViewController.m'
--- Music/View Controllers/SettingsViewController.m	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/SettingsViewController.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,60 @@
+//
+//  SettingsViewController.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/15/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "SettingsViewController.h"
+#import "UOAuthManager.h"
+
+@interface SettingsViewController ()
+- (IBAction)deleteCredentials:(id)sender;
+
+@end
+
+@implementation SettingsViewController
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+	// Do any additional setup after loading the view.
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+    [self checkAuthentication];
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+#pragma mark - Actions
+
+- (IBAction)deleteCredentials:(id)sender {
+    [[UOAuthManager sharedAuthManager] logout];
+    [self checkAuthentication];
+}
+
+#pragma mark - Private methods
+
+- (void)checkAuthentication {
+    if (![[UOAuthManager sharedAuthManager] hasCredentials]) {
+        [self performSegueWithIdentifier:@"AuthenticationSegue" sender:self];
+    }
+}
+
+@end

=== added file 'Music/View Controllers/SongsViewController.h'
--- Music/View Controllers/SongsViewController.h	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/SongsViewController.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,12 @@
+//
+//  SongsViewController.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/15/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "UOIndexedViewController.h"
+
+@interface SongsViewController : UOIndexedViewController
+@end

=== added file 'Music/View Controllers/SongsViewController.m'
--- Music/View Controllers/SongsViewController.m	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/SongsViewController.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,70 @@
+//
+//  SongsViewController.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/15/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "SongsViewController.h"
+#import "UONetworkStatusCoordinator.h"
+#import "Song.h"
+#import "SongCell.h"
+#import "NSString+Extras.h"
+#import "UOWebServiceController.h"
+#import "StreamingPlayer.h"
+
+@interface SongsViewController ()
+
+@end
+
+@implementation SongsViewController
+
+#pragma mark - UOIndexedViewControllers methods
+
+- (NSString *)entityName {
+    return @"Song";
+}
+
+- (NSString *)lastUpdatedKey {
+    return SONGS_LAST_UPDATED;
+}
+
+- (NSArray *)sortDescriptors {
+    return [NSArray arrayWithObjects:
+            [[NSSortDescriptor alloc] initWithKey:@"dearticlizedTitle" ascending:YES],
+            nil];
+}
+
+- (void)configureCell:(UITableViewCell *)cell forIndexPath:(NSIndexPath *)indexPath {
+    SongCell *songCell = (SongCell *)cell;
+    Song *song = [self.fetchedResultsController objectAtIndexPath:indexPath];
+    [songCell setSong:song];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    [[UOWebServiceController controller] updateSongs:self];
+}
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    if (![sender respondsToSelector:@selector(song)]) {
+        return; // Hit 'Now Playing'
+    }
+    
+    NSArray *songs = [[self.fetchedResultsController fetchedObjects] copy];
+    Song *song = ((SongCell *)sender).song;
+    
+    StreamingPlayer *player = [StreamingPlayer sharedStreamingPlayer];
+    player.currentSong = song;
+    player.currentPlaylist = songs;
+    player.isNewSong = YES;
+    player.isShuffle = NO;
+    
+    if (player.streamer) {
+        [player.streamer stop];
+    }
+    [player playPauseSong];
+}
+
+@end

=== added file 'Music/View Controllers/UOIndexedViewController.h'
--- Music/View Controllers/UOIndexedViewController.h	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/UOIndexedViewController.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,31 @@
+//
+//  UOIndexedViewController.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/17/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import <RestKit/RestKit.h>
+#import "UOWebServiceController.h"
+
+@interface UOIndexedViewController : UITableViewController <NSFetchedResultsControllerDelegate,UOWebServiceDelegate> {
+    NSMutableDictionary *groupedTableData;
+    NSArray *indexes;
+    BOOL indexed;
+    
+    NSArray *tableData;
+}
+@property (readonly, nonatomic) NSString *endpoint;
+@property (readonly, nonatomic) NSString *entityName;
+@property (readonly, nonatomic) NSString *sectionNameKeyPath;
+@property (readonly, nonatomic) NSString *lastUpdatedKey;
+@property (readonly, nonatomic) NSArray *sortDescriptors;
+- (void)update;
+- (void)configureCell:(UITableViewCell *)cell forIndexPath:(NSIndexPath *)indexPath;
+
+- (NSFetchedResultsController *)fetchedResultsController;
+
+@property (strong, nonatomic) IBOutlet UIBarButtonItem *nowPlayingButton;
+@end

=== added file 'Music/View Controllers/UOIndexedViewController.m'
--- Music/View Controllers/UOIndexedViewController.m	1970-01-01 00:00:00 +0000
+++ Music/View Controllers/UOIndexedViewController.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,169 @@
+//
+//  UOIndexedViewController.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/17/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "UOIndexedViewController.h"
+#import <RestKit/RestKit.h>
+#import "UOAppDelegate.h"
+#import "StreamingPlayer.h"
+
+@interface UOIndexedViewController () {
+    NSFetchedResultsController *_fetchedResultsController;
+}
+
+@end
+
+@implementation UOIndexedViewController
+
+#pragma mark - Abstract methods
+
+- (NSString *)endpoint {
+    return @"/";
+}
+
+- (NSString *)entityName {
+    return nil;
+}
+
+- (NSArray *)sortDescriptors {
+    return [NSArray array];
+}
+
+- (NSString *)sectionNameKeyPath {
+    return @"index";
+}
+
+- (NSString *)lastUpdatedKey {
+    return nil;
+}
+
+- (void)configureCell:(UITableViewCell *)cell forIndexPath:(NSIndexPath *)indexPath {
+    return;
+}
+
+- (void)update {
+}
+
+#pragma mark - UIViewController lifecycle
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    groupedTableData = [NSMutableDictionary dictionary];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    [self update];
+    
+    if (![[StreamingPlayer sharedStreamingPlayer] currentSong]) {
+        self.navigationItem.rightBarButtonItem = nil;
+    } else {
+        self.navigationItem.rightBarButtonItem = self.nowPlayingButton;
+    }
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+    return [[self.fetchedResultsController sections] count];
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    id <NSFetchedResultsSectionInfo> sectionInfo = [self.fetchedResultsController sections][section];
+    return [sectionInfo numberOfObjects];
+}
+
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
+    id <NSFetchedResultsSectionInfo> sectionInfo = [self.fetchedResultsController sections][section];
+    return [sectionInfo name];
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    static NSString *CellIdentifier = @"Cell";
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
+    
+    [self configureCell:cell forIndexPath:indexPath];
+    return cell;
+}
+
+- (NSArray *)sectionIndexTitlesForTableView:(UITableView *)tableView {
+    return [self.fetchedResultsController sectionIndexTitles];
+}
+
+#pragma mark - UOWebServiceDelegate methods
+
+- (void)webserviceUpdateComplete {
+    _fetchedResultsController = nil;
+    [self.tableView reloadData];
+}
+
+- (void)webserviceUpdateError:(NSError *)error {
+    if ([error code] == 2) { // Network is down.
+        return;
+    }
+    NSLog(@"Error: %@", [error localizedDescription]);
+}
+
+#pragma mark - RKObjectLoaderDelegate methods
+/*
+- (void)objectLoader:(RKObjectLoader *)objectLoader didFailWithError:(NSError *)error {
+    [UONetworkStatusCoordinator removeNetworkActivity];
+    if ([error code] == 2) { // Network is down.
+        return;
+    }
+    NSLog(@"Error: %@", [error localizedDescription]);
+    [[NSUserDefaults standardUserDefaults] setObject:nil forKey:[self lastUpdatedKey]];
+}
+
+- (void)objectLoader:(RKObjectLoader *)objectLoader didLoadObjects:(NSArray *)objects {
+    [UONetworkStatusCoordinator removeNetworkActivity];
+    _fetchedResultsController = nil;
+    [[NSUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:[self lastUpdatedKey]];
+    [self.tableView reloadData];
+}
+ */
+
+#pragma mark - Fetched results controller
+
+- (NSFetchedResultsController *)fetchedResultsController {
+    if (_fetchedResultsController) {
+        return _fetchedResultsController;
+    }
+    
+    NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:[self entityName]];
+    [fetchRequest setFetchBatchSize:20];
+    [fetchRequest setSortDescriptors:[self sortDescriptors]];
+      
+    _fetchedResultsController = [[NSFetchedResultsController alloc] initWithFetchRequest:fetchRequest 
+                                                                    managedObjectContext:[[UOAppDelegate delegate] managedObjectContext]
+                                                                      sectionNameKeyPath:[self sectionNameKeyPath]
+                                                                               cacheName:nil];
+    _fetchedResultsController.delegate = self;
+    
+    NSError *error = nil;
+    if (![_fetchedResultsController performFetch:&error]) {
+        if ([error code] == 134060) {
+            NSLog(@"The database model is stale. Please delete the app and re-install");
+        } else {
+            NSLog(@"OHNO: %@", [error localizedDescription]);
+        }
+    }
+    
+    return _fetchedResultsController;
+}
+
+- (void)controllerDidChangeContent:(NSFetchedResultsController *)controller {
+    [self.tableView reloadData];
+}
+
+@end

=== added directory 'Music/Views'
=== added file 'Music/Views/PlayerHeaderView.h'
--- Music/Views/PlayerHeaderView.h	1970-01-01 00:00:00 +0000
+++ Music/Views/PlayerHeaderView.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,21 @@
+//
+//  PlayerHeaderView.h
+//  U1Music
+//
+//  Created by Paul Hummer on 1/14/13.
+//  Copyright (c) 2013 Canonical. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface PlayerHeaderView : UIView
+
+@property(nonatomic,retain) IBOutlet UILabel *artist;
+@property(nonatomic,retain) IBOutlet UILabel *title;
+@property(nonatomic,retain) IBOutlet UILabel *album;
+
+- (void)setArtistName:(NSString *)artistName;
+- (void)setTitleName:(NSString *)titleName;
+- (void)setAlbumName:(NSString *)albumName;
+
+@end

=== added file 'Music/Views/PlayerHeaderView.m'
--- Music/Views/PlayerHeaderView.m	1970-01-01 00:00:00 +0000
+++ Music/Views/PlayerHeaderView.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,25 @@
+//
+//  PlayerHeaderView.m
+//  U1Music
+//
+//  Created by Paul Hummer on 1/14/13.
+//  Copyright (c) 2013 Canonical. All rights reserved.
+//
+
+#import "PlayerHeaderView.h"
+
+@implementation PlayerHeaderView
+
+- (void)setArtistName:(NSString *)artistName {
+    self.artist.text = artistName;
+}
+
+- (void)setTitleName:(NSString *)titleName {
+    self.title.text = titleName;
+}
+
+- (void)setAlbumName:(NSString *)albumName {
+    self.album.text = albumName;
+}
+
+@end

=== added directory 'Music/Views/Table Cells'
=== added file 'Music/Views/Table Cells/AlbumCell.h'
--- Music/Views/Table Cells/AlbumCell.h	1970-01-01 00:00:00 +0000
+++ Music/Views/Table Cells/AlbumCell.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,14 @@
+//
+//  AlbumCell.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/17/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "Album.h"
+
+@interface AlbumCell : UITableViewCell
+@property (nonatomic, retain) Album *album;
+@end

=== added file 'Music/Views/Table Cells/AlbumCell.m'
--- Music/Views/Table Cells/AlbumCell.m	1970-01-01 00:00:00 +0000
+++ Music/Views/Table Cells/AlbumCell.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,32 @@
+//
+//  AlbumCell.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/17/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "AlbumCell.h"
+
+@implementation AlbumCell
+@synthesize album = _album;
+
+- (void)setAlbum:(Album *)album {
+    _album = album;
+    
+    if (!album.art) {
+        [self.imageView setImage:[UIImage imageNamed:@"default-album-art-120.png"]];
+        [album fetchArt:^(UIImage *image) {
+            [self.imageView setImage:image];
+            [self setNeedsDisplay];
+        }];
+    } else {
+        [self.imageView setImage:album.art];
+    }
+    
+    [self.textLabel setText:album.title];
+    
+    [self.detailTextLabel setText:album.artist.name];
+}
+
+@end

=== added file 'Music/Views/Table Cells/ArtistCell.h'
--- Music/Views/Table Cells/ArtistCell.h	1970-01-01 00:00:00 +0000
+++ Music/Views/Table Cells/ArtistCell.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,14 @@
+//
+//  ArtistCell.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/16/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "Artist.h"
+
+@interface ArtistCell : UITableViewCell
+@property (nonatomic, retain) Artist *artist;
+@end

=== added file 'Music/Views/Table Cells/ArtistCell.m'
--- Music/Views/Table Cells/ArtistCell.m	1970-01-01 00:00:00 +0000
+++ Music/Views/Table Cells/ArtistCell.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,37 @@
+//
+//  ArtistCell.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/16/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "ArtistCell.h"
+
+@implementation ArtistCell
+@synthesize artist = _artist;
+
+- (void)setArtist:(Artist *)artist {
+    _artist = artist;
+    
+    if (!artist.art) {
+        [self.imageView setImage:[UIImage imageNamed:@"default-album-art-120.png"]];
+        [artist fetchArt:^(UIImage *image) {
+            [self.imageView setImage:image];
+            [self setNeedsDisplay];
+        }];
+    } else {
+        [self.imageView setImage:artist.art];
+    }
+    
+    [self.textLabel setText:artist.name];
+    if ([artist.albums count] > 0) {
+        NSString *pluralizedNoun = @"albums";
+        if ([artist.albums count] == 1) {
+            pluralizedNoun = @"album";
+        }
+        [self.detailTextLabel setText:[NSString stringWithFormat:@"%d %@", [artist.albums count], pluralizedNoun]];
+    }
+}
+
+@end

=== added file 'Music/Views/Table Cells/PlaylistCell.h'
--- Music/Views/Table Cells/PlaylistCell.h	1970-01-01 00:00:00 +0000
+++ Music/Views/Table Cells/PlaylistCell.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,14 @@
+//
+//  PlaylistCell.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/17/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "Playlist.h"
+
+@interface PlaylistCell : UITableViewCell
+@property (nonatomic, retain) Playlist *playlist;
+@end

=== added file 'Music/Views/Table Cells/PlaylistCell.m'
--- Music/Views/Table Cells/PlaylistCell.m	1970-01-01 00:00:00 +0000
+++ Music/Views/Table Cells/PlaylistCell.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,26 @@
+//
+//  PlaylistCell.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/17/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "PlaylistCell.h"
+
+@implementation PlaylistCell
+@synthesize playlist = _playlist;
+
+- (void)setPlaylist:(Playlist *)playlist {
+    _playlist = playlist;
+
+    [self.textLabel setText:playlist.title];
+
+    NSString *songCountNoun = @"songs";
+    if ([playlist.songCount integerValue] == 1) {
+        songCountNoun = @"song";
+    }
+    [self.detailTextLabel setText:[NSString stringWithFormat:@"%@ %@", playlist.songCount, songCountNoun]];
+}
+
+@end

=== added file 'Music/Views/Table Cells/SongCell.h'
--- Music/Views/Table Cells/SongCell.h	1970-01-01 00:00:00 +0000
+++ Music/Views/Table Cells/SongCell.h	2013-01-24 17:06:42 +0000
@@ -0,0 +1,14 @@
+//
+//  SongCell.h
+//  U1Music
+//
+//  Created by Paul Hummer on 11/17/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "Song.h"
+
+@interface SongCell : UITableViewCell
+@property (nonatomic, retain) Song *song;
+@end

=== added file 'Music/Views/Table Cells/SongCell.m'
--- Music/Views/Table Cells/SongCell.m	1970-01-01 00:00:00 +0000
+++ Music/Views/Table Cells/SongCell.m	2013-01-24 17:06:42 +0000
@@ -0,0 +1,32 @@
+//
+//  SongCell.m
+//  U1Music
+//
+//  Created by Paul Hummer on 11/17/12.
+//  Copyright (c) 2012 Canonical. All rights reserved.
+//
+
+#import "SongCell.h"
+#import "Artist.h"
+
+@implementation SongCell
+@synthesize song = _song;
+
+- (void)setSong:(Song *)song {
+    _song = song;
+    
+    if (!song.art) {
+        [self.imageView setImage:[UIImage imageNamed:@"default-album-art-120.png"]];
+        [song fetchArt:^(UIImage *image) {
+            [self.imageView setImage:image];
+            [self setNeedsDisplay];
+        }];
+    } else {
+        [self.imageView setImage:song.art];
+    }
+    
+    [self.textLabel setText:song.title];
+    [self.detailTextLabel setText:song.artist.name];
+}
+
+@end

=== renamed file 'Other Sources/main.m' => 'Music/main.m'
--- Other Sources/main.m	2012-09-15 06:47:35 +0000
+++ Music/main.m	2013-01-24 17:06:42 +0000
@@ -30,10 +30,10 @@
 
 #import <UIKit/UIKit.h>
 
-#import "U1MusicAppDelegate.h"
+#import "UOAppDelegate.h"
 
 int main(int argc, char *argv[]) {
     @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([U1MusicAppDelegate class]));
+        return UIApplicationMain(argc, argv, nil, NSStringFromClass([UOAppDelegate class]));
     }
 }

=== modified file 'U1Music-Info.plist'
--- U1Music-Info.plist	2012-08-09 20:06:43 +0000
+++ U1Music-Info.plist	2013-01-24 17:06:42 +0000
@@ -39,15 +39,15 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>58</string>
+	<string>100</string>
 	<key>LSRequiresIPhoneOS</key>
 	<false/>
-	<key>NSMainNibFile</key>
-	<string>MainWindow</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>audio</string>
 	</array>
+	<key>UIMainStoryboardFile</key>
+	<string>Storyboard_iPhone</string>
 	<key>UIPrerenderedIcon</key>
 	<true/>
 	<key>UIStatusBarStyle</key>

=== modified file 'U1Music.xcodeproj/project.pbxproj'
--- U1Music.xcodeproj/project.pbxproj	2012-09-25 21:28:26 +0000
+++ U1Music.xcodeproj/project.pbxproj	2013-01-24 17:06:42 +0000
@@ -26,28 +26,37 @@
 		523B3CFA15B73BA0004394F4 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF615B73BA0004394F4 /* [e-mail] */; };
 		523B3CFB15B73BA0004394F4 /* download.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF715B73BA0004394F4 /* download.png */; };
 		523B3CFC15B73BA0004394F4 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF815B73BA0004394F4 /* [e-mail] */; };
+		5268509716AE5267001F65A6 /* libRestKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5268509016AE516C001F65A6 /* libRestKit.a */; };
+		526850A816AEE4E1001F65A6 /* Storyboard_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 526850A516AEE4E1001F65A6 /* Storyboard_iPhone.storyboard */; };
+		526850A916AEE4E1001F65A6 /* UOAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850A716AEE4E1001F65A6 /* UOAppDelegate.m */; };
+		526850AC16AEF9DD001F65A6 /* UOMusic.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 526850AA16AEF9DD001F65A6 /* UOMusic.xcdatamodeld */; };
+		526850C416AEFA59001F65A6 /* AlbumsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850AF16AEFA59001F65A6 /* AlbumsViewController.m */; };
+		526850C516AEFA59001F65A6 /* AlbumViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850B116AEFA59001F65A6 /* AlbumViewController.m */; };
+		526850C616AEFA59001F65A6 /* ArtistsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850B316AEFA59001F65A6 /* ArtistsViewController.m */; };
+		526850C716AEFA59001F65A6 /* ArtistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850B516AEFA59001F65A6 /* ArtistViewController.m */; };
+		526850C816AEFA59001F65A6 /* PlayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850B716AEFA59001F65A6 /* PlayerViewController.m */; };
+		526850C916AEFA59001F65A6 /* PlaylistsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850B916AEFA59001F65A6 /* PlaylistsViewController.m */; };
+		526850CA16AEFA59001F65A6 /* SettingsAboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850BB16AEFA59001F65A6 /* SettingsAboutViewController.m */; };
+		526850CB16AEFA59001F65A6 /* SettingsAuthenticationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850BD16AEFA59001F65A6 /* SettingsAuthenticationViewController.m */; };
+		526850CC16AEFA59001F65A6 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850BF16AEFA59001F65A6 /* SettingsViewController.m */; };
+		526850CD16AEFA59001F65A6 /* SongsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850C116AEFA59001F65A6 /* SongsViewController.m */; };
+		526850CE16AEFA59001F65A6 /* UOIndexedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850C316AEFA59001F65A6 /* UOIndexedViewController.m */; };
+		526850DE16AEFA7D001F65A6 /* UOWebServiceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850D116AEFA7C001F65A6 /* UOWebServiceController.m */; };
+		526850DF16AEFA7D001F65A6 /* PlayerHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850D416AEFA7D001F65A6 /* PlayerHeaderView.m */; };
+		526850E016AEFA7D001F65A6 /* AlbumCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850D716AEFA7D001F65A6 /* AlbumCell.m */; };
+		526850E116AEFA7D001F65A6 /* ArtistCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850D916AEFA7D001F65A6 /* ArtistCell.m */; };
+		526850E216AEFA7D001F65A6 /* PlaylistCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850DB16AEFA7D001F65A6 /* PlaylistCell.m */; };
+		526850E316AEFA7D001F65A6 /* SongCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850DD16AEFA7D001F65A6 /* SongCell.m */; };
+		526850FF16AEFC6A001F65A6 /* Album.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850F616AEFC6A001F65A6 /* Album.m */; };
+		5268510016AEFC6A001F65A6 /* Artist.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850F816AEFC6A001F65A6 /* Artist.m */; };
+		5268510116AEFC6A001F65A6 /* Playlist.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850FA16AEFC6A001F65A6 /* Playlist.m */; };
+		5268510216AEFC6A001F65A6 /* Song.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850FC16AEFC6A001F65A6 /* Song.m */; };
+		5268510316AEFC6A001F65A6 /* UOModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 526850FE16AEFC6A001F65A6 /* UOModel.m */; };
+		5268510416AEFCB2001F65A6 /* CachedSongsPlaylist.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F114B61D8A00C7D5A3 /* CachedSongsPlaylist.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+		5268510516AEFCB2001F65A6 /* _U1CachedFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 960E4B3714E5884B002AAB79 /* _U1CachedFile.m */; };
+		5268510616AEFCB2001F65A6 /* U1CachedFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 960E4B3414E58844002AAB79 /* U1CachedFile.m */; };
+		5268510816AEFD20001F65A6 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5268510716AEFD20001F65A6 /* MobileCoreServices.framework */; };
 		5279764915F00B2600F8435F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5279764815F00B2600F8435F /* libz.dylib */; };
-		528515991604F410004A1F7C /* UbuntuOneAuthKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 528515941604F16D004A1F7C /* UbuntuOneAuthKit.a */; };
-		52A042FF1606D6C40000B4BC /* NSMutableURLRequest+Parameters.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042D71606D6C40000B4BC /* NSMutableURLRequest+Parameters.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A043001606D6C40000B4BC /* NSString+URLEncoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042D91606D6C40000B4BC /* NSString+URLEncoding.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A043011606D6C40000B4BC /* NSURL+Base.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042DB1606D6C40000B4BC /* NSURL+Base.m */; };
-		52A043021606D6C40000B4BC /* Base64Transcoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 52A042DD1606D6C40000B4BC /* Base64Transcoder.c */; };
-		52A043031606D6C40000B4BC /* hmac.c in Sources */ = {isa = PBXBuildFile; fileRef = 52A042DF1606D6C40000B4BC /* hmac.c */; };
-		52A043041606D6C40000B4BC /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = 52A042E11606D6C40000B4BC /* sha1.c */; };
-		52A043051606D6C40000B4BC /* OAAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042E41606D6C40000B4BC /* OAAttachment.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A043061606D6C40000B4BC /* OACall.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042E61606D6C40000B4BC /* OACall.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A043071606D6C40000B4BC /* OAConsumer.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042E81606D6C40000B4BC /* OAConsumer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A043081606D6C40000B4BC /* OADataFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042EA1606D6C40000B4BC /* OADataFetcher.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A043091606D6C40000B4BC /* OAHMAC_SHA1SignatureProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042EC1606D6C40000B4BC /* OAHMAC_SHA1SignatureProvider.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A0430A1606D6C40000B4BC /* OAMutableURLRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042EE1606D6C40000B4BC /* OAMutableURLRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A0430B1606D6C40000B4BC /* OAPlaintextSignatureProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042F01606D6C40000B4BC /* OAPlaintextSignatureProvider.m */; };
-		52A0430C1606D6C40000B4BC /* OAProblem.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042F21606D6C40000B4BC /* OAProblem.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A0430D1606D6C40000B4BC /* OARequestParameter.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042F41606D6C40000B4BC /* OARequestParameter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A0430E1606D6C40000B4BC /* OAServiceTicket.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042F61606D6C40000B4BC /* OAServiceTicket.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A0430F1606D6C40000B4BC /* OATestServer.rb in Resources */ = {isa = PBXBuildFile; fileRef = 52A042F81606D6C40000B4BC /* OATestServer.rb */; };
-		52A043101606D6C40000B4BC /* OAToken.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042FA1606D6C40000B4BC /* OAToken.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A043111606D6C40000B4BC /* OATokenManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042FC1606D6C40000B4BC /* OATokenManager.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A043121606D6C40000B4BC /* README in Resources */ = {isa = PBXBuildFile; fileRef = 52A042FE1606D6C40000B4BC /* README */; };
 		52AC3D671604513E00B4785D /* about_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D4B1604513E00B4785D /* about_logo.png */; };
 		52AC3D681604513E00B4785D /* albums.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D4C1604513E00B4785D /* albums.png */; };
 		52AC3D691604513E00B4785D /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D4D1604513E00B4785D /* [e-mail] */; };
@@ -77,6 +86,7 @@
 		52AC3D811604513E00B4785D /* uncached.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D651604513E00B4785D /* uncached.png */; };
 		52AC3D821604513E00B4785D /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D661604513E00B4785D /* [e-mail] */; };
 		52AC3D841604539000B4785D /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D831604539000B4785D /* [e-mail] */; };
+		52E7F4A316AF1522003A46DA /* UbuntuOneAuthKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 528515941604F16D004A1F7C /* UbuntuOneAuthKit.a */; };
 		536D620B1144495400DFCE56 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 536D620A1144495400DFCE56 /* SystemConfiguration.framework */; };
 		537DE2D9113F008C00875852 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 537DE2D8113F008C00875852 /* CoreFoundation.framework */; };
 		53F675D8113B092C00822059 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53F675D7113B092C00822059 /* MediaPlayer.framework */; };
@@ -86,22 +96,8 @@
 		91018B0B13573BBB0051EFDC /* UIImage+Resize.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B0A13573BBB0051EFDC /* UIImage+Resize.m */; };
 		91018B0E13573D150051EFDC /* UIImage+Alpha.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B0D13573D150051EFDC /* UIImage+Alpha.m */; };
 		91018B1113573D350051EFDC /* UIImage+RoundedCorner.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B1013573D350051EFDC /* UIImage+RoundedCorner.m */; };
-		91018B4B135A724B0051EFDC /* PlaylistEditAlbumListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B42135A724B0051EFDC /* PlaylistEditAlbumListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		91018B4C135A724B0051EFDC /* PlaylistEditAlbumViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B44135A724B0051EFDC /* PlaylistEditAlbumViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		91018B4D135A724B0051EFDC /* PlaylistEditArtistListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B46135A724B0051EFDC /* PlaylistEditArtistListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		91018B4E135A724B0051EFDC /* PlaylistEditArtistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B48135A724B0051EFDC /* PlaylistEditArtistViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		91018B4F135A724B0051EFDC /* PlaylistEditSongListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B4A135A724B0051EFDC /* PlaylistEditSongListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		9110DC38134C045A0046B8E4 /* AlbumParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9110DC37134C04590046B8E4 /* AlbumParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		9110DC44134EAC740046B8E4 /* AlbumListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9110DC43134EAC730046B8E4 /* AlbumListParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		9110DC571354A7490046B8E4 /* AlbumArtistUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9110DC561354A7470046B8E4 /* AlbumArtistUITableViewCell.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		9123D1A113257ADF00B40210 /* PlaylistListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9123D1A013257ADF00B40210 /* PlaylistListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		9123D1BB13280B3400B40210 /* PlaylistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9123D1BA13280B3400B40210 /* PlaylistViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		9123D1C3132816D200B40210 /* PlaylistListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9123D1C2132816D200B40210 /* PlaylistListParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		912D1259134617F600721EE4 /* SongListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D1258134617F600721EE4 /* SongListParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		912D1264134A162000721EE4 /* AlertPrompt.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D1263134A162000721EE4 /* AlertPrompt.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		912D1267134B609700721EE4 /* PlaylistEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D1266134B609600721EE4 /* PlaylistEditViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		912D392213311F2700A443B2 /* AlbumListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D392113311F2500A443B2 /* AlbumListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		912D392613311FC600A443B2 /* SongListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D392513311FC400A443B2 /* SongListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		9132827D144E07EA00395F40 /* libTestFlight.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 91328279144E07EA00395F40 /* libTestFlight.a */; };
 		91406EEA138AEEE000A7DA67 /* NSString+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 91406EE9138AEEE000A7DA67 /* NSString+Extras.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		9149D9CF159BEC3D009AE771 /* default-album-art-120.png in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9C9159BEC3D009AE771 /* default-album-art-120.png */; };
@@ -110,17 +106,9 @@
 		9149D9D2159BEC3D009AE771 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9CC159BEC3D009AE771 /* [e-mail] */; };
 		9149D9D3159BEC3D009AE771 /* default-album-art-640.png in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9CD159BEC3D009AE771 /* default-album-art-640.png */; };
 		9149D9D4159BEC3D009AE771 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9CE159BEC3D009AE771 /* [e-mail] */; };
-		914AC3FF14B61D8A00C7D5A3 /* CachedSongsPlaylist.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F114B61D8A00C7D5A3 /* CachedSongsPlaylist.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		914AC40014B61D8A00C7D5A3 /* _Album.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F414B61D8A00C7D5A3 /* _Album.m */; };
-		914AC40114B61D8A00C7D5A3 /* _Artist.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F614B61D8A00C7D5A3 /* _Artist.m */; };
-		914AC40214B61D8A00C7D5A3 /* _Playlist.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F814B61D8A00C7D5A3 /* _Playlist.m */; };
-		914AC40314B61D8A00C7D5A3 /* _PlaylistSongIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3FA14B61D8A00C7D5A3 /* _PlaylistSongIndex.m */; };
-		914AC40414B61D8A00C7D5A3 /* _Song.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3FC14B61D8A00C7D5A3 /* _Song.m */; };
-		914AC40514B61D8A00C7D5A3 /* PlaylistSongIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3FE14B61D8A00C7D5A3 /* PlaylistSongIndex.m */; };
 		917B47EF14E306C800062874 /* U1AutoDownloadsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 917B47EE14E306C800062874 /* U1AutoDownloadsManager.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		917B47FB14E42C7900062874 /* U1CacheFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 917B47FA14E42C7900062874 /* U1CacheFileManager.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		919376F3135CC1CF0030B7BD /* PlaylistEditSongUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 919376F2135CC1CF0030B7BD /* PlaylistEditSongUITableViewCell.m */; };
-		91B3A4441344CF92006C8193 /* SubsonicIndexedTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91B3A4431344CF91006C8193 /* SubsonicIndexedTableViewController.m */; };
 		91BE4018138E8D2300D44D68 /* UIActionSheet+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE4015138E8D2300D44D68 /* UIActionSheet+Blocks.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		91BE4019138E8D2300D44D68 /* UIAlertView+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE4017138E8D2300D44D68 /* UIAlertView+Blocks.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		91BE401C138E8D3A00D44D68 /* RIButtonItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE401B138E8D3A00D44D68 /* RIButtonItem.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
@@ -130,8 +118,6 @@
 		91D3A17214BE12FE003D4FC0 /* PlaylistUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 91D3A17114BE12FE003D4FC0 /* PlaylistUITableViewCell.m */; };
 		91E3E46414D33A2D006ED32F /* U1SerializedDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E3E46314D33A2D006ED32F /* U1SerializedDownloadOperation.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		91E3E46814D33A6F006ED32F /* U1ChunkDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E3E46714D33A6F006ED32F /* U1ChunkDownloadOperation.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		91E88609132DA82000618994 /* PlaylistParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E88608132DA82000618994 /* PlaylistParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		91F2653014EACFCC0027232B /* U1MigrationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91F2652E14EACFCC0027232B /* U1MigrationViewController.m */; };
 		91F2653114EACFCC0027232B /* U1MigrationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 91F2652F14EACFCC0027232B /* U1MigrationViewController.xib */; };
 		9316628812264A74003B0EB7 /* NSDate+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 9316628712264A74003B0EB7 /* NSDate+Extras.m */; };
 		932E7AA01255265A00E7C8FF /* about.css in Resources */ = {isa = PBXBuildFile; fileRef = 932E7A9E1255265A00E7C8FF /* about.css */; };
@@ -139,8 +125,6 @@
 		932E7B0912552CB400E7C8FF /* PullRefreshTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 932E7B0812552CB400E7C8FF /* PullRefreshTableViewController.m */; };
 		932E7B0B12552CD500E7C8FF /* arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 932E7B0A12552CD500E7C8FF /* arrow.png */; };
 		9354D0AB1248267B00733067 /* NSDictionary+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 9354D0AA1248267B00733067 /* NSDictionary+Extras.m */; };
-		936F20681227364200070F43 /* Playlist.m in Sources */ = {isa = PBXBuildFile; fileRef = 936F20671227364200070F43 /* Playlist.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		936F209012273D9000070F43 /* Song.m in Sources */ = {isa = PBXBuildFile; fileRef = 936F208F12273D9000070F43 /* Song.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		936F230A12284D1900070F43 /* NamedTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 936F230912284D1900070F43 /* NamedTextFieldCell.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		937FAA11137CFC1B00507E51 /* AlbumArtLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAA0E137CFC1B00507E51 /* AlbumArtLoader.m */; };
 		937FAA12137CFC1B00507E51 /* AlbumArtDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAA10137CFC1B00507E51 /* AlbumArtDownloadOperation.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
@@ -169,25 +153,14 @@
 		93DFFE3F135D70B60061F29F /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93DFFE3E135D70B60061F29F /* CoreData.framework */; };
 		93DFFE4D135D71760061F29F /* music.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 93DFFE4C135D71760061F29F /* music.xcdatamodeld */; };
 		93DFFE54135D72420061F29F /* NSManagedObjectContext+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 93DFFE53135D72420061F29F /* NSManagedObjectContext+Additions.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93EE2AF0124993F100E7E060 /* ArtistListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EE2AEF124993F100E7E060 /* ArtistListParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93EE2BA31249F33D00E7E060 /* ArtistParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EE2BA21249F33D00E7E060 /* ArtistParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		93F3344D1247FA0B006C6707 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3344C1247FA0B006C6707 /* Reachability.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F334521247FA2C006C6707 /* Album.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3344F1247FA2C006C6707 /* Album.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F334531247FA2C006C6707 /* Artist.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334511247FA2C006C6707 /* Artist.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		93F3345C1247FA85006C6707 /* AlbumUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3345B1247FA85006C6707 /* AlbumUITableViewCell.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		93F3345F1247FA97006C6707 /* SongUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3345E1247FA97006C6707 /* SongUITableViewCell.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		93F334681247FB02006C6707 /* SongViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93F334641247FB02006C6707 /* SongViewController.xib */; };
 		93F334691247FB02006C6707 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93F334651247FB02006C6707 /* MainWindow.xib */; };
 		93F3346A1247FB02006C6707 /* SearchableTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93F334661247FB02006C6707 /* SearchableTableViewController.xib */; };
-		93F334711247FB78006C6707 /* U1MusicAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */; };
 		93F334721247FB78006C6707 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334701247FB78006C6707 /* main.m */; };
 		93F334751247FB9F006C6707 /* AudioStreamer.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334741247FB9F006C6707 /* AudioStreamer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F3349F1247FCDC006C6707 /* ArtistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3348E1247FCDC006C6707 /* ArtistViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F334A01247FCDC006C6707 /* SongViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334901247FCDC006C6707 /* SongViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F334A31247FCDC006C6707 /* ArtistListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334961247FCDC006C6707 /* ArtistListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F334A41247FCDC006C6707 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334981247FCDC006C6707 /* SettingsViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F334A61247FCDC006C6707 /* AlbumViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3349C1247FCDC006C6707 /* AlbumViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F334A71247FCDC006C6707 /* SubsonicTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3349E1247FCDC006C6707 /* SubsonicTableViewController.m */; };
 		93FA42AE124DC1350080DF62 /* 03-loopback.png in Resources */ = {isa = PBXBuildFile; fileRef = 93FA42A7124DC1350080DF62 /* 03-loopback.png */; };
 		93FA42AF124DC1350080DF62 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 93FA42A8124DC1350080DF62 /* [e-mail] */; };
 		93FA42B0124DC1350080DF62 /* 05-shuffle.png in Resources */ = {isa = PBXBuildFile; fileRef = 93FA42A9124DC1350080DF62 /* 05-shuffle.png */; };
@@ -201,8 +174,6 @@
 		93FA43B5124DF07C0080DF62 /* player_overlay_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 93FA43B3124DF07C0080DF62 /* player_overlay_bg.png */; };
 		93FA43B6124DF07C0080DF62 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 93FA43B4124DF07C0080DF62 /* [e-mail] */; };
 		960E4B2E14E586AE002AAB79 /* CacheFileAccess.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 960E4B2C14E586AE002AAB79 /* CacheFileAccess.xcdatamodeld */; };
-		960E4B3514E58844002AAB79 /* U1CachedFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 960E4B3414E58844002AAB79 /* U1CachedFile.m */; };
-		960E4B3814E5884B002AAB79 /* _U1CachedFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 960E4B3714E5884B002AAB79 /* _U1CachedFile.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		9619626614E088F50038DACA /* U1SocketListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 9619626514E088F50038DACA /* U1SocketListener.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		9619626A14E08F4B0038DACA /* U1HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 9619626914E08F4B0038DACA /* U1HTTPMessage.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		9619626F14E08F630038DACA /* U1HTTPRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 9619626C14E08F630038DACA /* U1HTTPRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
@@ -221,6 +192,34 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		5268508F16AE516C001F65A6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 5268508516AE516B001F65A6 /* RestKit.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 25160D1614564E810060A5C5;
+			remoteInfo = RestKit;
+		};
+		5268509116AE516C001F65A6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 5268508516AE516B001F65A6 /* RestKit.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 25160D2614564E820060A5C5;
+			remoteInfo = RestKitTests;
+		};
+		5268509316AE516C001F65A6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 5268508516AE516B001F65A6 /* RestKit.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 25160E62145651060060A5C5;
+			remoteInfo = RestKitFramework;
+		};
+		5268509516AE516C001F65A6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 5268508516AE516B001F65A6 /* RestKit.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 25160E78145651060060A5C5;
+			remoteInfo = RestKitFrameworkTests;
+		};
 		528515931604F16D004A1F7C /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 5285158E1604F16B004A1F7C /* UbuntuOneAuthKit.xcodeproj */;
@@ -267,48 +266,58 @@
 		523B3CF615B73BA0004394F4 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
 		523B3CF715B73BA0004394F4 /* download.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = download.png; sourceTree = "<group>"; };
 		523B3CF815B73BA0004394F4 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
+		5268508516AE516B001F65A6 /* RestKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RestKit.xcodeproj; path = ../RestKit/RestKit.xcodeproj; sourceTree = "<group>"; };
+		526850A516AEE4E1001F65A6 /* Storyboard_iPhone.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Storyboard_iPhone.storyboard; sourceTree = "<group>"; };
+		526850A616AEE4E1001F65A6 /* UOAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UOAppDelegate.h; sourceTree = "<group>"; };
+		526850A716AEE4E1001F65A6 /* UOAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UOAppDelegate.m; sourceTree = "<group>"; };
+		526850AB16AEF9DD001F65A6 /* UOMusic.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = UOMusic.xcdatamodel; sourceTree = "<group>"; };
+		526850AE16AEFA59001F65A6 /* AlbumsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlbumsViewController.h; sourceTree = "<group>"; };
+		526850AF16AEFA59001F65A6 /* AlbumsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AlbumsViewController.m; sourceTree = "<group>"; };
+		526850B016AEFA59001F65A6 /* AlbumViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlbumViewController.h; sourceTree = "<group>"; };
+		526850B116AEFA59001F65A6 /* AlbumViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AlbumViewController.m; sourceTree = "<group>"; };
+		526850B216AEFA59001F65A6 /* ArtistsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArtistsViewController.h; sourceTree = "<group>"; };
+		526850B316AEFA59001F65A6 /* ArtistsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArtistsViewController.m; sourceTree = "<group>"; };
+		526850B416AEFA59001F65A6 /* ArtistViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArtistViewController.h; sourceTree = "<group>"; };
+		526850B516AEFA59001F65A6 /* ArtistViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArtistViewController.m; sourceTree = "<group>"; };
+		526850B616AEFA59001F65A6 /* PlayerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerViewController.h; sourceTree = "<group>"; };
+		526850B716AEFA59001F65A6 /* PlayerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlayerViewController.m; sourceTree = "<group>"; };
+		526850B816AEFA59001F65A6 /* PlaylistsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistsViewController.h; sourceTree = "<group>"; };
+		526850B916AEFA59001F65A6 /* PlaylistsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlaylistsViewController.m; sourceTree = "<group>"; };
+		526850BA16AEFA59001F65A6 /* SettingsAboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsAboutViewController.h; sourceTree = "<group>"; };
+		526850BB16AEFA59001F65A6 /* SettingsAboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsAboutViewController.m; sourceTree = "<group>"; };
+		526850BC16AEFA59001F65A6 /* SettingsAuthenticationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsAuthenticationViewController.h; sourceTree = "<group>"; };
+		526850BD16AEFA59001F65A6 /* SettingsAuthenticationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsAuthenticationViewController.m; sourceTree = "<group>"; };
+		526850BE16AEFA59001F65A6 /* SettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsViewController.h; sourceTree = "<group>"; };
+		526850BF16AEFA59001F65A6 /* SettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsViewController.m; sourceTree = "<group>"; };
+		526850C016AEFA59001F65A6 /* SongsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SongsViewController.h; sourceTree = "<group>"; };
+		526850C116AEFA59001F65A6 /* SongsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SongsViewController.m; sourceTree = "<group>"; };
+		526850C216AEFA59001F65A6 /* UOIndexedViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UOIndexedViewController.h; sourceTree = "<group>"; };
+		526850C316AEFA59001F65A6 /* UOIndexedViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UOIndexedViewController.m; sourceTree = "<group>"; };
+		526850D016AEFA7C001F65A6 /* UOWebServiceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UOWebServiceController.h; sourceTree = "<group>"; };
+		526850D116AEFA7C001F65A6 /* UOWebServiceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UOWebServiceController.m; sourceTree = "<group>"; };
+		526850D316AEFA7D001F65A6 /* PlayerHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerHeaderView.h; sourceTree = "<group>"; };
+		526850D416AEFA7D001F65A6 /* PlayerHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlayerHeaderView.m; sourceTree = "<group>"; };
+		526850D616AEFA7D001F65A6 /* AlbumCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlbumCell.h; sourceTree = "<group>"; };
+		526850D716AEFA7D001F65A6 /* AlbumCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AlbumCell.m; sourceTree = "<group>"; };
+		526850D816AEFA7D001F65A6 /* ArtistCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArtistCell.h; sourceTree = "<group>"; };
+		526850D916AEFA7D001F65A6 /* ArtistCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArtistCell.m; sourceTree = "<group>"; };
+		526850DA16AEFA7D001F65A6 /* PlaylistCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistCell.h; sourceTree = "<group>"; };
+		526850DB16AEFA7D001F65A6 /* PlaylistCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlaylistCell.m; sourceTree = "<group>"; };
+		526850DC16AEFA7D001F65A6 /* SongCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SongCell.h; sourceTree = "<group>"; };
+		526850DD16AEFA7D001F65A6 /* SongCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SongCell.m; sourceTree = "<group>"; };
+		526850F516AEFC6A001F65A6 /* Album.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Album.h; sourceTree = "<group>"; };
+		526850F616AEFC6A001F65A6 /* Album.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Album.m; sourceTree = "<group>"; };
+		526850F716AEFC6A001F65A6 /* Artist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Artist.h; sourceTree = "<group>"; };
+		526850F816AEFC6A001F65A6 /* Artist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Artist.m; sourceTree = "<group>"; };
+		526850F916AEFC6A001F65A6 /* Playlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Playlist.h; sourceTree = "<group>"; };
+		526850FA16AEFC6A001F65A6 /* Playlist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Playlist.m; sourceTree = "<group>"; };
+		526850FB16AEFC6A001F65A6 /* Song.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Song.h; sourceTree = "<group>"; };
+		526850FC16AEFC6A001F65A6 /* Song.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Song.m; sourceTree = "<group>"; };
+		526850FD16AEFC6A001F65A6 /* UOModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UOModel.h; sourceTree = "<group>"; };
+		526850FE16AEFC6A001F65A6 /* UOModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UOModel.m; sourceTree = "<group>"; };
+		5268510716AEFD20001F65A6 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
 		5279764815F00B2600F8435F /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		5285158E1604F16B004A1F7C /* UbuntuOneAuthKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = UbuntuOneAuthKit.xcodeproj; path = ../UbuntuOneAuthKit/UbuntuOneAuthKit.xcodeproj; sourceTree = "<group>"; };
-		52A042D61606D6C40000B4BC /* NSMutableURLRequest+Parameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableURLRequest+Parameters.h"; sourceTree = "<group>"; };
-		52A042D71606D6C40000B4BC /* NSMutableURLRequest+Parameters.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableURLRequest+Parameters.m"; sourceTree = "<group>"; };
-		52A042D81606D6C40000B4BC /* NSString+URLEncoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+URLEncoding.h"; sourceTree = "<group>"; };
-		52A042D91606D6C40000B4BC /* NSString+URLEncoding.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+URLEncoding.m"; sourceTree = "<group>"; };
-		52A042DA1606D6C40000B4BC /* NSURL+Base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURL+Base.h"; sourceTree = "<group>"; };
-		52A042DB1606D6C40000B4BC /* NSURL+Base.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURL+Base.m"; sourceTree = "<group>"; };
-		52A042DD1606D6C40000B4BC /* Base64Transcoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Base64Transcoder.c; sourceTree = "<group>"; };
-		52A042DE1606D6C40000B4BC /* Base64Transcoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64Transcoder.h; sourceTree = "<group>"; };
-		52A042DF1606D6C40000B4BC /* hmac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hmac.c; sourceTree = "<group>"; };
-		52A042E01606D6C40000B4BC /* hmac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hmac.h; sourceTree = "<group>"; };
-		52A042E11606D6C40000B4BC /* sha1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha1.c; sourceTree = "<group>"; };
-		52A042E21606D6C40000B4BC /* sha1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha1.h; sourceTree = "<group>"; };
-		52A042E31606D6C40000B4BC /* OAAttachment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAAttachment.h; sourceTree = "<group>"; };
-		52A042E41606D6C40000B4BC /* OAAttachment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OAAttachment.m; sourceTree = "<group>"; };
-		52A042E51606D6C40000B4BC /* OACall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OACall.h; sourceTree = "<group>"; };
-		52A042E61606D6C40000B4BC /* OACall.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OACall.m; sourceTree = "<group>"; };
-		52A042E71606D6C40000B4BC /* OAConsumer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAConsumer.h; sourceTree = "<group>"; };
-		52A042E81606D6C40000B4BC /* OAConsumer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OAConsumer.m; sourceTree = "<group>"; };
-		52A042E91606D6C40000B4BC /* OADataFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OADataFetcher.h; sourceTree = "<group>"; };
-		52A042EA1606D6C40000B4BC /* OADataFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OADataFetcher.m; sourceTree = "<group>"; };
-		52A042EB1606D6C40000B4BC /* OAHMAC_SHA1SignatureProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAHMAC_SHA1SignatureProvider.h; sourceTree = "<group>"; };
-		52A042EC1606D6C40000B4BC /* OAHMAC_SHA1SignatureProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OAHMAC_SHA1SignatureProvider.m; sourceTree = "<group>"; };
-		52A042ED1606D6C40000B4BC /* OAMutableURLRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAMutableURLRequest.h; sourceTree = "<group>"; };
-		52A042EE1606D6C40000B4BC /* OAMutableURLRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OAMutableURLRequest.m; sourceTree = "<group>"; };
-		52A042EF1606D6C40000B4BC /* OAPlaintextSignatureProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAPlaintextSignatureProvider.h; sourceTree = "<group>"; };
-		52A042F01606D6C40000B4BC /* OAPlaintextSignatureProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OAPlaintextSignatureProvider.m; sourceTree = "<group>"; };
-		52A042F11606D6C40000B4BC /* OAProblem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAProblem.h; sourceTree = "<group>"; };
-		52A042F21606D6C40000B4BC /* OAProblem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OAProblem.m; sourceTree = "<group>"; };
-		52A042F31606D6C40000B4BC /* OARequestParameter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OARequestParameter.h; sourceTree = "<group>"; };
-		52A042F41606D6C40000B4BC /* OARequestParameter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OARequestParameter.m; sourceTree = "<group>"; };
-		52A042F51606D6C40000B4BC /* OAServiceTicket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAServiceTicket.h; sourceTree = "<group>"; };
-		52A042F61606D6C40000B4BC /* OAServiceTicket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OAServiceTicket.m; sourceTree = "<group>"; };
-		52A042F71606D6C40000B4BC /* OASignatureProviding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OASignatureProviding.h; sourceTree = "<group>"; };
-		52A042F81606D6C40000B4BC /* OATestServer.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = OATestServer.rb; sourceTree = "<group>"; };
-		52A042F91606D6C40000B4BC /* OAToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAToken.h; sourceTree = "<group>"; };
-		52A042FA1606D6C40000B4BC /* OAToken.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OAToken.m; sourceTree = "<group>"; };
-		52A042FB1606D6C40000B4BC /* OATokenManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OATokenManager.h; sourceTree = "<group>"; };
-		52A042FC1606D6C40000B4BC /* OATokenManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OATokenManager.m; sourceTree = "<group>"; };
-		52A042FD1606D6C40000B4BC /* OAuthConsumer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAuthConsumer.h; sourceTree = "<group>"; };
-		52A042FE1606D6C40000B4BC /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
 		52AC3D4B1604513E00B4785D /* about_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = about_logo.png; sourceTree = "<group>"; };
 		52AC3D4C1604513E00B4785D /* albums.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = albums.png; sourceTree = "<group>"; };
 		52AC3D4D1604513E00B4785D /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
@@ -515,8 +524,8 @@
 		93F334641247FB02006C6707 /* SongViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SongViewController.xib; sourceTree = "<group>"; };
 		93F334651247FB02006C6707 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; };
 		93F334661247FB02006C6707 /* SearchableTableViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SearchableTableViewController.xib; sourceTree = "<group>"; };
-		93F3346E1247FB78006C6707 /* U1MusicAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1MusicAppDelegate.h; sourceTree = "<group>"; };
-		93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1MusicAppDelegate.m; sourceTree = "<group>"; };
+		93F3346E1247FB78006C6707 /* U1MusicAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = U1MusicAppDelegate.h; path = "Other Sources/U1MusicAppDelegate.h"; sourceTree = "<group>"; };
+		93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = U1MusicAppDelegate.m; path = "Other Sources/U1MusicAppDelegate.m"; sourceTree = "<group>"; };
 		93F334701247FB78006C6707 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		93F334731247FB9F006C6707 /* AudioStreamer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioStreamer.h; sourceTree = "<group>"; };
 		93F334741247FB9F006C6707 /* AudioStreamer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioStreamer.m; sourceTree = "<group>"; };
@@ -586,20 +595,22 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				528515991604F410004A1F7C /* UbuntuOneAuthKit.a in Frameworks */,
-				5279764915F00B2600F8435F /* libz.dylib in Frameworks */,
+				53F675E8113B096400822059 /* AudioToolbox.framework in Frameworks */,
+				53F675DC113B093900822059 /* CFNetwork.framework in Frameworks */,
+				93DFFE3F135D70B60061F29F /* CoreData.framework in Frameworks */,
+				537DE2D9113F008C00875852 /* CoreFoundation.framework in Frameworks */,
+				2892E4100DC94CBA00A64D0F /* CoreGraphics.framework in Frameworks */,
 				1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
-				1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
-				2892E4100DC94CBA00A64D0F /* CoreGraphics.framework in Frameworks */,
 				53F675D8113B092C00822059 /* MediaPlayer.framework in Frameworks */,
-				53F675DC113B093900822059 /* CFNetwork.framework in Frameworks */,
+				5268510816AEFD20001F65A6 /* MobileCoreServices.framework in Frameworks */,
 				53F675E2113B095900822059 /* QuartzCore.framework in Frameworks */,
-				53F675E8113B096400822059 /* AudioToolbox.framework in Frameworks */,
-				537DE2D9113F008C00875852 /* CoreFoundation.framework in Frameworks */,
+				93A54024123188880048BC3D /* Security.framework in Frameworks */,
 				536D620B1144495400DFCE56 /* SystemConfiguration.framework in Frameworks */,
-				93A54024123188880048BC3D /* Security.framework in Frameworks */,
-				93DFFE3F135D70B60061F29F /* CoreData.framework in Frameworks */,
+				1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
+				5279764915F00B2600F8435F /* libz.dylib in Frameworks */,
 				9132827D144E07EA00395F40 /* libTestFlight.a in Frameworks */,
+				5268509716AE5267001F65A6 /* libRestKit.a in Frameworks */,
+				52E7F4A316AF1522003A46DA /* UbuntuOneAuthKit.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -617,15 +628,16 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
+				5268508516AE516B001F65A6 /* RestKit.xcodeproj */,
 				5285158E1604F16B004A1F7C /* UbuntuOneAuthKit.xcodeproj */,
 				93F3346C1247FB78006C6707 /* Music */,
+				526850A416AEE4B7001F65A6 /* Deprecated */,
 				91018B261359233E0051EFDC /* Base View Controllers */,
 				93F3348C1247FCDC006C6707 /* Root View Controllers */,
 				91018B27135923960051EFDC /* Sub View Controllers */,
 				91018B28135923D20051EFDC /* Playlist Edit View Controllers */,
 				93F334631247FB02006C6707 /* Xibs */,
 				93F334441247F9B9006C6707 /* Utilities */,
-				936F20651227363800070F43 /* Models */,
 				936F1F2E12271B6500070F43 /* Controls */,
 				9316628512264A74003B0EB7 /* Categories */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
@@ -648,6 +660,7 @@
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				5268510716AEFD20001F65A6 /* MobileCoreServices.framework */,
 				1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
 				1D30AB110D05D00D00671497 /* Foundation.framework */,
 				2892E40F0DC94CBA00A64D0F /* CoreGraphics.framework */,
@@ -663,6 +676,111 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		5268508616AE516B001F65A6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				5268509016AE516C001F65A6 /* libRestKit.a */,
+				5268509216AE516C001F65A6 /* RestKitTests.octest */,
+				5268509416AE516C001F65A6 /* RestKit.framework */,
+				5268509616AE516C001F65A6 /* RestKitFrameworkTests.octest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		526850A416AEE4B7001F65A6 /* Deprecated */ = {
+			isa = PBXGroup;
+			children = (
+				91D3A16D14B93B2A003D4FC0 /* MOC.h */,
+				91D3A16E14B93B2A003D4FC0 /* MOC.m */,
+				914AC3F014B61D8A00C7D5A3 /* CachedSongsPlaylist.h */,
+				914AC3F114B61D8A00C7D5A3 /* CachedSongsPlaylist.m */,
+				936F20651227363800070F43 /* Models */,
+				93F3346E1247FB78006C6707 /* U1MusicAppDelegate.h */,
+				93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */,
+			);
+			name = Deprecated;
+			sourceTree = "<group>";
+		};
+		526850AD16AEFA59001F65A6 /* View Controllers */ = {
+			isa = PBXGroup;
+			children = (
+				526850AE16AEFA59001F65A6 /* AlbumsViewController.h */,
+				526850AF16AEFA59001F65A6 /* AlbumsViewController.m */,
+				526850B016AEFA59001F65A6 /* AlbumViewController.h */,
+				526850B116AEFA59001F65A6 /* AlbumViewController.m */,
+				526850B216AEFA59001F65A6 /* ArtistsViewController.h */,
+				526850B316AEFA59001F65A6 /* ArtistsViewController.m */,
+				526850B416AEFA59001F65A6 /* ArtistViewController.h */,
+				526850B516AEFA59001F65A6 /* ArtistViewController.m */,
+				526850B616AEFA59001F65A6 /* PlayerViewController.h */,
+				526850B716AEFA59001F65A6 /* PlayerViewController.m */,
+				526850B816AEFA59001F65A6 /* PlaylistsViewController.h */,
+				526850B916AEFA59001F65A6 /* PlaylistsViewController.m */,
+				526850BA16AEFA59001F65A6 /* SettingsAboutViewController.h */,
+				526850BB16AEFA59001F65A6 /* SettingsAboutViewController.m */,
+				526850BC16AEFA59001F65A6 /* SettingsAuthenticationViewController.h */,
+				526850BD16AEFA59001F65A6 /* SettingsAuthenticationViewController.m */,
+				526850BE16AEFA59001F65A6 /* SettingsViewController.h */,
+				526850BF16AEFA59001F65A6 /* SettingsViewController.m */,
+				526850C016AEFA59001F65A6 /* SongsViewController.h */,
+				526850C116AEFA59001F65A6 /* SongsViewController.m */,
+				526850C216AEFA59001F65A6 /* UOIndexedViewController.h */,
+				526850C316AEFA59001F65A6 /* UOIndexedViewController.m */,
+			);
+			path = "View Controllers";
+			sourceTree = "<group>";
+		};
+		526850CF16AEFA7C001F65A6 /* Utilities */ = {
+			isa = PBXGroup;
+			children = (
+				526850D016AEFA7C001F65A6 /* UOWebServiceController.h */,
+				526850D116AEFA7C001F65A6 /* UOWebServiceController.m */,
+			);
+			path = Utilities;
+			sourceTree = "<group>";
+		};
+		526850D216AEFA7C001F65A6 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				526850D316AEFA7D001F65A6 /* PlayerHeaderView.h */,
+				526850D416AEFA7D001F65A6 /* PlayerHeaderView.m */,
+				526850D516AEFA7D001F65A6 /* Table Cells */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
+		526850D516AEFA7D001F65A6 /* Table Cells */ = {
+			isa = PBXGroup;
+			children = (
+				526850D616AEFA7D001F65A6 /* AlbumCell.h */,
+				526850D716AEFA7D001F65A6 /* AlbumCell.m */,
+				526850D816AEFA7D001F65A6 /* ArtistCell.h */,
+				526850D916AEFA7D001F65A6 /* ArtistCell.m */,
+				526850DA16AEFA7D001F65A6 /* PlaylistCell.h */,
+				526850DB16AEFA7D001F65A6 /* PlaylistCell.m */,
+				526850DC16AEFA7D001F65A6 /* SongCell.h */,
+				526850DD16AEFA7D001F65A6 /* SongCell.m */,
+			);
+			path = "Table Cells";
+			sourceTree = "<group>";
+		};
+		526850F416AEFC6A001F65A6 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				526850F516AEFC6A001F65A6 /* Album.h */,
+				526850F616AEFC6A001F65A6 /* Album.m */,
+				526850F716AEFC6A001F65A6 /* Artist.h */,
+				526850F816AEFC6A001F65A6 /* Artist.m */,
+				526850F916AEFC6A001F65A6 /* Playlist.h */,
+				526850FA16AEFC6A001F65A6 /* Playlist.m */,
+				526850FB16AEFC6A001F65A6 /* Song.h */,
+				526850FC16AEFC6A001F65A6 /* Song.m */,
+				526850FD16AEFC6A001F65A6 /* UOModel.h */,
+				526850FE16AEFC6A001F65A6 /* UOModel.m */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
 		528515571604EED8004A1F7C /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
@@ -682,70 +800,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		52A042D41606D6C40000B4BC /* oauthconsumer */ = {
-			isa = PBXGroup;
-			children = (
-				52A042D51606D6C40000B4BC /* Categories */,
-				52A042DC1606D6C40000B4BC /* Crypto */,
-				52A042E31606D6C40000B4BC /* OAAttachment.h */,
-				52A042E41606D6C40000B4BC /* OAAttachment.m */,
-				52A042E51606D6C40000B4BC /* OACall.h */,
-				52A042E61606D6C40000B4BC /* OACall.m */,
-				52A042E71606D6C40000B4BC /* OAConsumer.h */,
-				52A042E81606D6C40000B4BC /* OAConsumer.m */,
-				52A042E91606D6C40000B4BC /* OADataFetcher.h */,
-				52A042EA1606D6C40000B4BC /* OADataFetcher.m */,
-				52A042EB1606D6C40000B4BC /* OAHMAC_SHA1SignatureProvider.h */,
-				52A042EC1606D6C40000B4BC /* OAHMAC_SHA1SignatureProvider.m */,
-				52A042ED1606D6C40000B4BC /* OAMutableURLRequest.h */,
-				52A042EE1606D6C40000B4BC /* OAMutableURLRequest.m */,
-				52A042EF1606D6C40000B4BC /* OAPlaintextSignatureProvider.h */,
-				52A042F01606D6C40000B4BC /* OAPlaintextSignatureProvider.m */,
-				52A042F11606D6C40000B4BC /* OAProblem.h */,
-				52A042F21606D6C40000B4BC /* OAProblem.m */,
-				52A042F31606D6C40000B4BC /* OARequestParameter.h */,
-				52A042F41606D6C40000B4BC /* OARequestParameter.m */,
-				52A042F51606D6C40000B4BC /* OAServiceTicket.h */,
-				52A042F61606D6C40000B4BC /* OAServiceTicket.m */,
-				52A042F71606D6C40000B4BC /* OASignatureProviding.h */,
-				52A042F81606D6C40000B4BC /* OATestServer.rb */,
-				52A042F91606D6C40000B4BC /* OAToken.h */,
-				52A042FA1606D6C40000B4BC /* OAToken.m */,
-				52A042FB1606D6C40000B4BC /* OATokenManager.h */,
-				52A042FC1606D6C40000B4BC /* OATokenManager.m */,
-				52A042FD1606D6C40000B4BC /* OAuthConsumer.h */,
-				52A042FE1606D6C40000B4BC /* README */,
-			);
-			name = oauthconsumer;
-			path = Dependencies/oauthconsumer;
-			sourceTree = "<group>";
-		};
-		52A042D51606D6C40000B4BC /* Categories */ = {
-			isa = PBXGroup;
-			children = (
-				52A042D61606D6C40000B4BC /* NSMutableURLRequest+Parameters.h */,
-				52A042D71606D6C40000B4BC /* NSMutableURLRequest+Parameters.m */,
-				52A042D81606D6C40000B4BC /* NSString+URLEncoding.h */,
-				52A042D91606D6C40000B4BC /* NSString+URLEncoding.m */,
-				52A042DA1606D6C40000B4BC /* NSURL+Base.h */,
-				52A042DB1606D6C40000B4BC /* NSURL+Base.m */,
-			);
-			path = Categories;
-			sourceTree = "<group>";
-		};
-		52A042DC1606D6C40000B4BC /* Crypto */ = {
-			isa = PBXGroup;
-			children = (
-				52A042DD1606D6C40000B4BC /* Base64Transcoder.c */,
-				52A042DE1606D6C40000B4BC /* Base64Transcoder.h */,
-				52A042DF1606D6C40000B4BC /* hmac.c */,
-				52A042E01606D6C40000B4BC /* hmac.h */,
-				52A042E11606D6C40000B4BC /* sha1.c */,
-				52A042E21606D6C40000B4BC /* sha1.h */,
-			);
-			path = Crypto;
-			sourceTree = "<group>";
-		};
 		91018B261359233E0051EFDC /* Base View Controllers */ = {
 			isa = PBXGroup;
 			children = (
@@ -925,8 +979,6 @@
 			isa = PBXGroup;
 			children = (
 				914AC3F214B61D8A00C7D5A3 /* Generated */,
-				91D3A16D14B93B2A003D4FC0 /* MOC.h */,
-				91D3A16E14B93B2A003D4FC0 /* MOC.m */,
 				93F3344E1247FA2C006C6707 /* Album.h */,
 				93F3344F1247FA2C006C6707 /* Album.m */,
 				93F334501247FA2C006C6707 /* Artist.h */,
@@ -937,8 +989,6 @@
 				936F20671227364200070F43 /* Playlist.m */,
 				914AC3FD14B61D8A00C7D5A3 /* PlaylistSongIndex.h */,
 				914AC3FE14B61D8A00C7D5A3 /* PlaylistSongIndex.m */,
-				914AC3F014B61D8A00C7D5A3 /* CachedSongsPlaylist.h */,
-				914AC3F114B61D8A00C7D5A3 /* CachedSongsPlaylist.m */,
 			);
 			name = Models;
 			path = models;
@@ -1015,14 +1065,19 @@
 		93F3346C1247FB78006C6707 /* Music */ = {
 			isa = PBXGroup;
 			children = (
+				526850F416AEFC6A001F65A6 /* Models */,
+				528515571604EED8004A1F7C /* Supporting Files */,
+				526850CF16AEFA7C001F65A6 /* Utilities */,
+				526850AD16AEFA59001F65A6 /* View Controllers */,
+				526850D216AEFA7C001F65A6 /* Views */,
+				526850A516AEE4E1001F65A6 /* Storyboard_iPhone.storyboard */,
+				526850A616AEE4E1001F65A6 /* UOAppDelegate.h */,
+				526850A716AEE4E1001F65A6 /* UOAppDelegate.m */,
 				93F334841247FC15006C6707 /* U1Music_Prefix.pch */,
-				93F3346E1247FB78006C6707 /* U1MusicAppDelegate.h */,
-				93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */,
+				526850AA16AEF9DD001F65A6 /* UOMusic.xcdatamodeld */,
 				93DFFE4C135D71760061F29F /* music.xcdatamodeld */,
-				528515571604EED8004A1F7C /* Supporting Files */,
 			);
-			name = Music;
-			path = "Other Sources";
+			path = Music;
 			sourceTree = "<group>";
 		};
 		93F3348C1247FCDC006C6707 /* Root View Controllers */ = {
@@ -1170,7 +1225,6 @@
 		964FA39013CA5BE60018A65B /* Dependencies */ = {
 			isa = PBXGroup;
 			children = (
-				52A042D41606D6C40000B4BC /* oauthconsumer */,
 				93BC520A124C187700B7587C /* SynthesizeSingleton.h */,
 				5279764815F00B2600F8435F /* libz.dylib */,
 				91328278144E07EA00395F40 /* TestFlight SDK */,
@@ -1245,6 +1299,10 @@
 			projectDirPath = "";
 			projectReferences = (
 				{
+					ProductGroup = 5268508616AE516B001F65A6 /* Products */;
+					ProjectRef = 5268508516AE516B001F65A6 /* RestKit.xcodeproj */;
+				},
+				{
 					ProductGroup = 5285158F1604F16B004A1F7C /* Products */;
 					ProjectRef = 5285158E1604F16B004A1F7C /* UbuntuOneAuthKit.xcodeproj */;
 				},
@@ -1257,6 +1315,34 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
+		5268509016AE516C001F65A6 /* libRestKit.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libRestKit.a;
+			remoteRef = 5268508F16AE516C001F65A6 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		5268509216AE516C001F65A6 /* RestKitTests.octest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = RestKitTests.octest;
+			remoteRef = 5268509116AE516C001F65A6 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		5268509416AE516C001F65A6 /* RestKit.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = RestKit.framework;
+			remoteRef = 5268509316AE516C001F65A6 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		5268509616AE516C001F65A6 /* RestKitFrameworkTests.octest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = RestKitFrameworkTests.octest;
+			remoteRef = 5268509516AE516C001F65A6 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		528515941604F16D004A1F7C /* UbuntuOneAuthKit.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1356,8 +1442,7 @@
 				52AC3D811604513E00B4785D /* uncached.png in Resources */,
 				52AC3D821604513E00B4785D /* [e-mail] in Resources */,
 				52AC3D841604539000B4785D /* [e-mail] in Resources */,
-				52A0430F1606D6C40000B4BC /* OATestServer.rb in Resources */,
-				52A043121606D6C40000B4BC /* README in Resources */,
+				526850A816AEE4E1001F65A6 /* Storyboard_iPhone.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1386,27 +1471,17 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5268510416AEFCB2001F65A6 /* CachedSongsPlaylist.m in Sources */,
+				5268510516AEFCB2001F65A6 /* _U1CachedFile.m in Sources */,
+				5268510616AEFCB2001F65A6 /* U1CachedFile.m in Sources */,
 				9316628812264A74003B0EB7 /* NSDate+Extras.m in Sources */,
-				936F20681227364200070F43 /* Playlist.m in Sources */,
-				936F209012273D9000070F43 /* Song.m in Sources */,
 				936F230A12284D1900070F43 /* NamedTextFieldCell.m in Sources */,
 				93F3344D1247FA0B006C6707 /* Reachability.m in Sources */,
-				93F334521247FA2C006C6707 /* Album.m in Sources */,
-				93F334531247FA2C006C6707 /* Artist.m in Sources */,
 				93F3345C1247FA85006C6707 /* AlbumUITableViewCell.m in Sources */,
 				93F3345F1247FA97006C6707 /* SongUITableViewCell.m in Sources */,
-				93F334711247FB78006C6707 /* U1MusicAppDelegate.m in Sources */,
 				93F334721247FB78006C6707 /* main.m in Sources */,
 				93F334751247FB9F006C6707 /* AudioStreamer.m in Sources */,
-				93F3349F1247FCDC006C6707 /* ArtistViewController.m in Sources */,
-				93F334A01247FCDC006C6707 /* SongViewController.m in Sources */,
-				93F334A31247FCDC006C6707 /* ArtistListViewController.m in Sources */,
-				93F334A41247FCDC006C6707 /* SettingsViewController.m in Sources */,
-				93F334A61247FCDC006C6707 /* AlbumViewController.m in Sources */,
-				93F334A71247FCDC006C6707 /* SubsonicTableViewController.m in Sources */,
 				9354D0AB1248267B00733067 /* NSDictionary+Extras.m in Sources */,
-				93EE2AF0124993F100E7E060 /* ArtistListParser.m in Sources */,
-				93EE2BA31249F33D00E7E060 /* ArtistParser.m in Sources */,
 				93BC5209124C181600B7587C /* Subsonic.m in Sources */,
 				93BC52A7124C1E6900B7587C /* StreamingPlayer.m in Sources */,
 				93D6B0FF124ED061007880B0 /* SubsonicViewController.m in Sources */,
@@ -1416,27 +1491,11 @@
 				93D6B54B1252CE57007880B0 /* URLQueryStringParser.m in Sources */,
 				93CCBD7D12540CB700AFFC22 /* AboutViewController.m in Sources */,
 				932E7B0912552CB400E7C8FF /* PullRefreshTableViewController.m in Sources */,
-				9123D1A113257ADF00B40210 /* PlaylistListViewController.m in Sources */,
-				9123D1BB13280B3400B40210 /* PlaylistViewController.m in Sources */,
-				9123D1C3132816D200B40210 /* PlaylistListParser.m in Sources */,
-				91E88609132DA82000618994 /* PlaylistParser.m in Sources */,
-				912D392213311F2700A443B2 /* AlbumListViewController.m in Sources */,
-				912D392613311FC600A443B2 /* SongListViewController.m in Sources */,
-				91B3A4441344CF92006C8193 /* SubsonicIndexedTableViewController.m in Sources */,
-				912D1259134617F600721EE4 /* SongListParser.m in Sources */,
 				912D1264134A162000721EE4 /* AlertPrompt.m in Sources */,
-				912D1267134B609700721EE4 /* PlaylistEditViewController.m in Sources */,
-				9110DC38134C045A0046B8E4 /* AlbumParser.m in Sources */,
-				9110DC44134EAC740046B8E4 /* AlbumListParser.m in Sources */,
 				9110DC571354A7490046B8E4 /* AlbumArtistUITableViewCell.m in Sources */,
 				91018B0B13573BBB0051EFDC /* UIImage+Resize.m in Sources */,
 				91018B0E13573D150051EFDC /* UIImage+Alpha.m in Sources */,
 				91018B1113573D350051EFDC /* UIImage+RoundedCorner.m in Sources */,
-				91018B4B135A724B0051EFDC /* PlaylistEditAlbumListViewController.m in Sources */,
-				91018B4C135A724B0051EFDC /* PlaylistEditAlbumViewController.m in Sources */,
-				91018B4D135A724B0051EFDC /* PlaylistEditArtistListViewController.m in Sources */,
-				91018B4E135A724B0051EFDC /* PlaylistEditArtistViewController.m in Sources */,
-				91018B4F135A724B0051EFDC /* PlaylistEditSongListViewController.m in Sources */,
 				919376F3135CC1CF0030B7BD /* PlaylistEditSongUITableViewCell.m in Sources */,
 				93DFFE4D135D71760061F29F /* music.xcdatamodeld in Sources */,
 				93DFFE54135D72420061F29F /* NSManagedObjectContext+Additions.m in Sources */,
@@ -1462,13 +1521,6 @@
 				9619626F14E08F630038DACA /* U1HTTPRequest.m in Sources */,
 				9619627014E08F630038DACA /* U1HTTPResponse.m in Sources */,
 				9619627314E0A4930038DACA /* U1HTTPServer.m in Sources */,
-				914AC3FF14B61D8A00C7D5A3 /* CachedSongsPlaylist.m in Sources */,
-				914AC40014B61D8A00C7D5A3 /* _Album.m in Sources */,
-				914AC40114B61D8A00C7D5A3 /* _Artist.m in Sources */,
-				914AC40214B61D8A00C7D5A3 /* _Playlist.m in Sources */,
-				914AC40314B61D8A00C7D5A3 /* _PlaylistSongIndex.m in Sources */,
-				914AC40414B61D8A00C7D5A3 /* _Song.m in Sources */,
-				914AC40514B61D8A00C7D5A3 /* PlaylistSongIndex.m in Sources */,
 				91C8CCAF14B7883600A0E311 /* ArtistUITableViewCell.m in Sources */,
 				91D3A16F14B93B2A003D4FC0 /* MOC.m in Sources */,
 				91D3A17214BE12FE003D4FC0 /* PlaylistUITableViewCell.m in Sources */,
@@ -1480,29 +1532,32 @@
 				917B47FB14E42C7900062874 /* U1CacheFileManager.m in Sources */,
 				91C493D014E4593C00BC1815 /* U1ByteSizeValueTransformer.m in Sources */,
 				960E4B2E14E586AE002AAB79 /* CacheFileAccess.xcdatamodeld in Sources */,
-				960E4B3514E58844002AAB79 /* U1CachedFile.m in Sources */,
-				960E4B3814E5884B002AAB79 /* _U1CachedFile.m in Sources */,
-				91F2653014EACFCC0027232B /* U1MigrationViewController.m in Sources */,
 				523B3CDE15B4C42F004394F4 /* SongUITableView.m in Sources */,
 				523B3CE615B5D814004394F4 /* UOPullGestureRecognizer.m in Sources */,
-				52A042FF1606D6C40000B4BC /* NSMutableURLRequest+Parameters.m in Sources */,
-				52A043001606D6C40000B4BC /* NSString+URLEncoding.m in Sources */,
-				52A043011606D6C40000B4BC /* NSURL+Base.m in Sources */,
-				52A043021606D6C40000B4BC /* Base64Transcoder.c in Sources */,
-				52A043031606D6C40000B4BC /* hmac.c in Sources */,
-				52A043041606D6C40000B4BC /* sha1.c in Sources */,
-				52A043051606D6C40000B4BC /* OAAttachment.m in Sources */,
-				52A043061606D6C40000B4BC /* OACall.m in Sources */,
-				52A043071606D6C40000B4BC /* OAConsumer.m in Sources */,
-				52A043081606D6C40000B4BC /* OADataFetcher.m in Sources */,
-				52A043091606D6C40000B4BC /* OAHMAC_SHA1SignatureProvider.m in Sources */,
-				52A0430A1606D6C40000B4BC /* OAMutableURLRequest.m in Sources */,
-				52A0430B1606D6C40000B4BC /* OAPlaintextSignatureProvider.m in Sources */,
-				52A0430C1606D6C40000B4BC /* OAProblem.m in Sources */,
-				52A0430D1606D6C40000B4BC /* OARequestParameter.m in Sources */,
-				52A0430E1606D6C40000B4BC /* OAServiceTicket.m in Sources */,
-				52A043101606D6C40000B4BC /* OAToken.m in Sources */,
-				52A043111606D6C40000B4BC /* OATokenManager.m in Sources */,
+				526850A916AEE4E1001F65A6 /* UOAppDelegate.m in Sources */,
+				526850AC16AEF9DD001F65A6 /* UOMusic.xcdatamodeld in Sources */,
+				526850C416AEFA59001F65A6 /* AlbumsViewController.m in Sources */,
+				526850C516AEFA59001F65A6 /* AlbumViewController.m in Sources */,
+				526850C616AEFA59001F65A6 /* ArtistsViewController.m in Sources */,
+				526850C716AEFA59001F65A6 /* ArtistViewController.m in Sources */,
+				526850C816AEFA59001F65A6 /* PlayerViewController.m in Sources */,
+				526850C916AEFA59001F65A6 /* PlaylistsViewController.m in Sources */,
+				526850CA16AEFA59001F65A6 /* SettingsAboutViewController.m in Sources */,
+				526850CB16AEFA59001F65A6 /* SettingsAuthenticationViewController.m in Sources */,
+				526850CC16AEFA59001F65A6 /* SettingsViewController.m in Sources */,
+				526850CD16AEFA59001F65A6 /* SongsViewController.m in Sources */,
+				526850CE16AEFA59001F65A6 /* UOIndexedViewController.m in Sources */,
+				526850DE16AEFA7D001F65A6 /* UOWebServiceController.m in Sources */,
+				526850DF16AEFA7D001F65A6 /* PlayerHeaderView.m in Sources */,
+				526850E016AEFA7D001F65A6 /* AlbumCell.m in Sources */,
+				526850E116AEFA7D001F65A6 /* ArtistCell.m in Sources */,
+				526850E216AEFA7D001F65A6 /* PlaylistCell.m in Sources */,
+				526850E316AEFA7D001F65A6 /* SongCell.m in Sources */,
+				526850FF16AEFC6A001F65A6 /* Album.m in Sources */,
+				5268510016AEFC6A001F65A6 /* Artist.m in Sources */,
+				5268510116AEFC6A001F65A6 /* Playlist.m in Sources */,
+				5268510216AEFC6A001F65A6 /* Song.m in Sources */,
+				5268510316AEFC6A001F65A6 /* UOModel.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1536,7 +1591,10 @@
 				GCC_PREFIX_HEADER = U1Music_Prefix.pch;
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include";
+				HEADER_SEARCH_PATHS = (
+					"$(BUILT_PRODUCTS_DIR)/usr/local/include",
+					"\"$(BUILT_PRODUCTS_DIR)/../../Headers\"",
+				);
 				INFOPLIST_FILE = "U1Music-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				LIBRARY_SEARCH_PATHS = (
@@ -1544,6 +1602,7 @@
 					"\"$(SRCROOT)/TestFlight SDK\"",
 					"$(BUILT_PRODUCTS_DIR)/**",
 				);
+				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "U1 Music";
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=*]" = "";
@@ -1569,7 +1628,10 @@
 				GCC_PREFIX_HEADER = U1Music_Prefix.pch;
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include";
+				HEADER_SEARCH_PATHS = (
+					"$(BUILT_PRODUCTS_DIR)/usr/local/include",
+					"\"$(BUILT_PRODUCTS_DIR)/../../Headers\"",
+				);
 				INFOPLIST_FILE = "U1Music-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				LIBRARY_SEARCH_PATHS = (
@@ -1577,6 +1639,7 @@
 					"\"$(SRCROOT)/TestFlight SDK\"",
 					"$(BUILT_PRODUCTS_DIR)/**",
 				);
+				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "U1 Music";
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -1646,6 +1709,16 @@
 /* End XCConfigurationList section */
 
 /* Begin XCVersionGroup section */
+		526850AA16AEF9DD001F65A6 /* UOMusic.xcdatamodeld */ = {
+			isa = XCVersionGroup;
+			children = (
+				526850AB16AEF9DD001F65A6 /* UOMusic.xcdatamodel */,
+			);
+			currentVersion = 526850AB16AEF9DD001F65A6 /* UOMusic.xcdatamodel */;
+			path = UOMusic.xcdatamodeld;
+			sourceTree = "<group>";
+			versionGroupType = wrapper.xcdatamodel;
+		};
 		93DFFE4C135D71760061F29F /* music.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (

=== modified file 'U1Music_Prefix.pch'
--- U1Music_Prefix.pch	2012-09-25 21:28:26 +0000
+++ U1Music_Prefix.pch	2013-01-24 17:06:42 +0000
@@ -12,6 +12,10 @@
     #import <Foundation/Foundation.h>
     #import <UIKit/UIKit.h>
 	#import <CoreData/CoreData.h>
+
+    #import <SystemConfiguration/SystemConfiguration.h>
+    #import <MobileCoreServices/MobileCoreServices.h>
+
 	#import "Globals.h"
 	#import "MOC.h"
 	#import "NSManagedObjectContext+Additions.h"

=== modified file 'music.xcdatamodeld/U1Music 2.2-31.xcdatamodel/elements'
Binary files music.xcdatamodeld/U1Music 2.2-31.xcdatamodel/elements	2012-01-07 04:48:49 +0000 and music.xcdatamodeld/U1Music 2.2-31.xcdatamodel/elements	2013-01-24 17:06:42 +0000 differ
=== modified file 'music.xcdatamodeld/U1Music 2.2-31.xcdatamodel/layout'
Binary files music.xcdatamodeld/U1Music 2.2-31.xcdatamodel/layout	2012-01-07 04:48:49 +0000 and music.xcdatamodeld/U1Music 2.2-31.xcdatamodel/layout	2013-01-24 17:06:42 +0000 differ