diff --git a/frontend/src/Activity/History/HistoryConnector.js b/frontend/src/Activity/History/HistoryConnector.js
index c3eb9d8b1..c43c1aa43 100644
--- a/frontend/src/Activity/History/HistoryConnector.js
+++ b/frontend/src/Activity/History/HistoryConnector.js
@@ -43,7 +43,11 @@ class HistoryConnector extends Component {
   componentDidUpdate(prevProps) {
     if (hasDifferentItems(prevProps.items, this.props.items)) {
       const albumIds = selectUniqueIds(this.props.items, 'albumId');
-      this.props.fetchEpisodes({ albumIds });
+      if (albumIds.length) {
+        this.props.fetchEpisodes({ albumIds });
+      } else {
+        this.props.clearEpisodes();
+      }
     }
   }
 
diff --git a/frontend/src/Activity/Queue/QueueConnector.js b/frontend/src/Activity/Queue/QueueConnector.js
index 2e5c36ced..966e46900 100644
--- a/frontend/src/Activity/Queue/QueueConnector.js
+++ b/frontend/src/Activity/Queue/QueueConnector.js
@@ -52,7 +52,11 @@ class QueueConnector extends Component {
   componentDidUpdate(prevProps) {
     if (hasDifferentItems(prevProps.items, this.props.items)) {
       const albumIds = selectUniqueIds(this.props.items, 'albumId');
-      this.props.fetchEpisodes({ albumIds });
+      if (albumIds.length) {
+        this.props.fetchEpisodes({ albumIds });
+      } else {
+        this.props.clearEpisodes();
+      }
 
     }
   }
diff --git a/frontend/src/AddArtist/AddNewArtist/AddNewArtistSearchResult.js b/frontend/src/AddArtist/AddNewArtist/AddNewArtistSearchResult.js
index 5cae6fbb4..e1fe3a2b9 100644
--- a/frontend/src/AddArtist/AddNewArtist/AddNewArtistSearchResult.js
+++ b/frontend/src/AddArtist/AddNewArtist/AddNewArtistSearchResult.js
@@ -44,7 +44,7 @@ class AddNewArtistSearchResult extends Component {
 
   componentDidUpdate(prevProps) {
     if (!prevProps.isExistingArtist && this.props.isExistingArtist) {
-      this.onAddSerisModalClose();
+      this.onAddArtistModalClose();
     }
   }
 
@@ -55,7 +55,7 @@ class AddNewArtistSearchResult extends Component {
     this.setState({ isNewAddArtistModalOpen: true });
   }
 
-  onAddSerisModalClose = () => {
+  onAddArtistModalClose = () => {
     this.setState({ isNewAddArtistModalOpen: false });
   }
 
@@ -183,7 +183,7 @@ class AddNewArtistSearchResult extends Component {
           year={year}
           overview={overview}
           images={images}
-          onModalClose={this.onAddSerisModalClose}
+          onModalClose={this.onAddArtistModalClose}
         />
       </Link>
     );
diff --git a/frontend/src/Album/EpisodeDetailsModalContentConnector.js b/frontend/src/Album/EpisodeDetailsModalContentConnector.js
index 0e84426f5..42790757e 100644
--- a/frontend/src/Album/EpisodeDetailsModalContentConnector.js
+++ b/frontend/src/Album/EpisodeDetailsModalContentConnector.js
@@ -2,13 +2,12 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { clearReleases } from 'Store/Actions/releaseActions';
+import { cancelFetchReleases, clearReleases } from 'Store/Actions/releaseActions';
 import { toggleEpisodeMonitored } from 'Store/Actions/episodeActions';
 import createEpisodeSelector from 'Store/Selectors/createEpisodeSelector';
 import createArtistSelector from 'Store/Selectors/createArtistSelector';
 import episodeEntities from 'Album/episodeEntities';
 import { fetchTracks, clearTracks } from 'Store/Actions/trackActions';
-import { fetchTrackFiles, clearTrackFiles } from 'Store/Actions/trackFileActions';
 import EpisodeDetailsModalContent from './EpisodeDetailsModalContent';
 
 function createMapStateToProps() {
@@ -32,14 +31,38 @@ function createMapStateToProps() {
   );
 }
 
-const mapDispatchToProps = {
-  clearReleases,
-  fetchTracks,
-  clearTracks,
-  fetchTrackFiles,
-  clearTrackFiles,
-  toggleEpisodeMonitored
-};
+function createMapDispatchToProps(dispatch, props) {
+  return {
+    dispatchCancelFetchReleases() {
+      dispatch(cancelFetchReleases());
+    },
+
+    dispatchClearReleases() {
+      dispatch(clearReleases());
+    },
+
+    dispatchFetchTracks({ artistId, albumId }) {
+      dispatch(fetchTracks({ artistId, albumId }));
+    },
+
+    dispatchClearTracks() {
+      dispatch(clearTracks());
+    },
+
+    onMonitorAlbumPress(monitored) {
+      const {
+        albumId,
+        episodeEntity
+      } = this.props;
+
+      dispatch(toggleEpisodeMonitored({
+        episodeEntity,
+        albumId,
+        monitored
+      }));
+    }
+  };
+}
 
 class EpisodeDetailsModalContentConnector extends Component {
 
@@ -53,7 +76,8 @@ class EpisodeDetailsModalContentConnector extends Component {
     // Clear pending releases here so we can reshow the search
     // results even after switching tabs.
     this._unpopulate();
-    this.props.clearReleases();
+    this.props.dispatchCancelFetchReleases();
+    this.props.dispatchClearReleases();
   }
 
   //
@@ -62,40 +86,24 @@ class EpisodeDetailsModalContentConnector extends Component {
   _populate() {
     const artistId = this.props.artistId;
     const albumId = this.props.albumId;
-    this.props.fetchTracks({ artistId, albumId });
-    // this.props.fetchTrackFiles({ artistId, albumId });
+    this.props.dispatchFetchTracks({ artistId, albumId });
   }
 
   _unpopulate() {
-    this.props.clearTracks();
-    // this.props.clearTrackFiles();
+    this.props.dispatchClearTracks();
   }
 
   //
-  // Listeners
+  // Render
 
-  onMonitorAlbumPress = (monitored) => {
+  render() {
     const {
-      albumId,
-      episodeEntity
+      dispatchClearReleases,
+      ...otherProps
     } = this.props;
 
-    this.props.toggleEpisodeMonitored({
-      episodeEntity,
-      albumId,
-      monitored
-    });
-  }
-
-  //
-  // Render
-
-  render() {
     return (
-      <EpisodeDetailsModalContent
-        {...this.props}
-        onMonitorAlbumPress={this.onMonitorAlbumPress}
-      />
+      <EpisodeDetailsModalContent {...otherProps} />
     );
   }
 }
@@ -104,16 +112,14 @@ EpisodeDetailsModalContentConnector.propTypes = {
   albumId: PropTypes.number.isRequired,
   episodeEntity: PropTypes.string.isRequired,
   artistId: PropTypes.number.isRequired,
-  fetchTracks: PropTypes.func.isRequired,
-  clearTracks: PropTypes.func.isRequired,
-  fetchTrackFiles: PropTypes.func.isRequired,
-  clearTrackFiles: PropTypes.func.isRequired,
-  clearReleases: PropTypes.func.isRequired,
-  toggleEpisodeMonitored: PropTypes.func.isRequired
+  dispatchFetchTracks: PropTypes.func.isRequired,
+  dispatchClearTracks: PropTypes.func.isRequired,
+  dispatchCancelFetchReleases: PropTypes.func.isRequired,
+  dispatchClearReleases: PropTypes.func.isRequired
 };
 
 EpisodeDetailsModalContentConnector.defaultProps = {
   episodeEntity: episodeEntities.EPISODES
 };
 
-export default connect(createMapStateToProps, mapDispatchToProps)(EpisodeDetailsModalContentConnector);
+export default connect(createMapStateToProps, createMapDispatchToProps)(EpisodeDetailsModalContentConnector);
diff --git a/frontend/src/Album/EpisodeLanguage.js b/frontend/src/Album/EpisodeLanguage.js
index fc784ef51..7a5a24963 100644
--- a/frontend/src/Album/EpisodeLanguage.js
+++ b/frontend/src/Album/EpisodeLanguage.js
@@ -3,20 +3,24 @@ import React from 'react';
 import Label from 'Components/Label';
 
 function EpisodeLanguage(props) {
-  const language = props.language;
+  const {
+    className,
+    language
+  } = props;
 
   if (!language) {
     return null;
   }
 
   return (
-    <Label>
+    <Label className={className}>
       {language.name}
     </Label>
   );
 }
 
 EpisodeLanguage.propTypes = {
+  className: PropTypes.string,
   language: PropTypes.object
 };
 
diff --git a/frontend/src/Album/EpisodeQuality.js b/frontend/src/Album/EpisodeQuality.js
index 1202f8706..65a3f3dbc 100644
--- a/frontend/src/Album/EpisodeQuality.js
+++ b/frontend/src/Album/EpisodeQuality.js
@@ -24,6 +24,7 @@ function getTooltip(title, quality, size) {
 
 function EpisodeQuality(props) {
   const {
+    className,
     title,
     quality,
     size,
@@ -32,6 +33,7 @@ function EpisodeQuality(props) {
 
   return (
     <Label
+      className={className}
       kind={isCutoffNotMet ? kinds.INVERSE : kinds.DEFAULT}
       title={getTooltip(title, quality, size)}
     >
@@ -41,6 +43,7 @@ function EpisodeQuality(props) {
 }
 
 EpisodeQuality.propTypes = {
+  className: PropTypes.string,
   title: PropTypes.string,
   quality: PropTypes.object.isRequired,
   size: PropTypes.number,
diff --git a/frontend/src/Album/History/AlbumHistoryRow.js b/frontend/src/Album/History/AlbumHistoryRow.js
index 5b7c3c4ff..743b48c3b 100644
--- a/frontend/src/Album/History/AlbumHistoryRow.js
+++ b/frontend/src/Album/History/AlbumHistoryRow.js
@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import titleCase from 'Utilities/String/titleCase';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import Icon from 'Components/Icon';
 import IconButton from 'Components/Link/IconButton';
@@ -14,6 +13,18 @@ import HistoryDetailsConnector from 'Activity/History/Details/HistoryDetailsConn
 import HistoryEventTypeCell from 'Activity/History/HistoryEventTypeCell';
 import styles from './AlbumHistoryRow.css';
 
+function getTitle(eventType) {
+  switch (eventType) {
+    case 'grabbed': return 'Grabbed';
+    case 'artistFolderImported': return 'Artist Folder Imported';
+    case 'downloadFolderImported': return 'Download Folder Imported';
+    case 'downloadFailed': return 'Download Failed';
+    case 'trackFileDeleted': return 'Track File Deleted';
+    case 'trackFileRenamed': return 'Track File Renamed';
+    default: return 'Unknown';
+  }
+}
+
 class AlbumHistoryRow extends Component {
 
   //
@@ -89,7 +100,7 @@ class AlbumHistoryRow extends Component {
                 name={icons.INFO}
               />
             }
-            title={titleCase(eventType)}
+            title={getTitle(eventType)}
             body={
               <HistoryDetailsConnector
                 eventType={eventType}
diff --git a/frontend/src/Album/Summary/EpisodeSummaryConnector.js b/frontend/src/Album/Summary/EpisodeSummaryConnector.js
index 090c0dba6..eca8d0704 100644
--- a/frontend/src/Album/Summary/EpisodeSummaryConnector.js
+++ b/frontend/src/Album/Summary/EpisodeSummaryConnector.js
@@ -15,7 +15,9 @@ function createMapStateToProps() {
     createCommandsSelector(),
     createDimensionsSelector(),
     (tracks, episode, commands, dimensions) => {
-      const items = _.filter(tracks.items, { albumId: episode.id });
+      const filteredItems = _.filter(tracks.items, { albumId: episode.id });
+      const mediumSortedItems = _.orderBy(filteredItems, 'absoluteTrackNumber');
+      const items = _.orderBy(mediumSortedItems, 'mediumNumber');
 
       return {
         network: episode.label,
diff --git a/frontend/src/Album/Summary/TrackDetailRow.js b/frontend/src/Album/Summary/TrackDetailRow.js
index 26a2ba232..bd2dab263 100644
--- a/frontend/src/Album/Summary/TrackDetailRow.js
+++ b/frontend/src/Album/Summary/TrackDetailRow.js
@@ -24,7 +24,8 @@ class TrackDetailRow extends Component {
     const {
       id,
       title,
-      trackNumber,
+      mediumNumber,
+      absoluteTrackNumber,
       duration,
       columns,
       trackFileId
@@ -43,13 +44,24 @@ class TrackDetailRow extends Component {
               return null;
             }
 
-            if (name === 'trackNumber') {
+            if (name === 'medium') {
               return (
                 <TableRowCell
                   key={name}
                   className={styles.trackNumber}
                 >
-                  {trackNumber}
+                  {mediumNumber}
+                </TableRowCell>
+              );
+            }
+
+            if (name === 'absoluteTrackNumber') {
+              return (
+                <TableRowCell
+                  key={name}
+                  className={styles.trackNumber}
+                >
+                  {absoluteTrackNumber}
                 </TableRowCell>
               );
             }
@@ -117,7 +129,8 @@ TrackDetailRow.propTypes = {
   duration: PropTypes.number.isRequired,
   trackFileId: PropTypes.number.isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
-  trackNumber: PropTypes.number.isRequired
+  mediumNumber: PropTypes.number.isRequired,
+  absoluteTrackNumber: PropTypes.number.isRequired
 };
 
 export default TrackDetailRow;
diff --git a/frontend/src/Artist/Details/AlbumRow.js b/frontend/src/Artist/Details/AlbumRow.js
index 0ae589625..0c9f27cf3 100644
--- a/frontend/src/Artist/Details/AlbumRow.js
+++ b/frontend/src/Artist/Details/AlbumRow.js
@@ -63,6 +63,7 @@ class AlbumRow extends Component {
       statistics,
       duration,
       releaseDate,
+      mediumCount,
       title,
       isSaving,
       artistMonitored,
@@ -131,6 +132,16 @@ class AlbumRow extends Component {
               );
             }
 
+            if (name === 'mediumCount') {
+              return (
+                <TableRowCell key={name}>
+                  {
+                    mediumCount
+                  }
+                </TableRowCell>
+              );
+            }
+
             if (name === 'trackCount') {
               return (
                 <TableRowCell key={name}>
@@ -203,6 +214,7 @@ AlbumRow.propTypes = {
   artistId: PropTypes.number.isRequired,
   monitored: PropTypes.bool.isRequired,
   releaseDate: PropTypes.string.isRequired,
+  mediumCount: PropTypes.number.isRequired,
   duration: PropTypes.number.isRequired,
   title: PropTypes.string.isRequired,
   isSaving: PropTypes.bool,
diff --git a/frontend/src/Artist/Details/ArtistDetails.css b/frontend/src/Artist/Details/ArtistDetails.css
index 1fd2f3940..6a9f4e22f 100644
--- a/frontend/src/Artist/Details/ArtistDetails.css
+++ b/frontend/src/Artist/Details/ArtistDetails.css
@@ -47,10 +47,18 @@
 }
 
 .info {
+  display: flex;
+  flex-direction: column;
   flex-grow: 1;
   overflow: hidden;
 }
 
+.titleRow {
+  display: flex;
+  justify-content: space-between;
+  flex: 0 0 auto;
+}
+
 .titleContainer {
   display: flex;
   justify-content: space-between;
@@ -111,6 +119,11 @@
   font-family: $monoSpaceFontFamily;
 }
 
+.overview {
+  flex: 1 0 auto;
+  min-height: 0;
+}
+
 .contentContainer {
   padding: 20px;
 }
diff --git a/frontend/src/Artist/Details/ArtistDetails.js b/frontend/src/Artist/Details/ArtistDetails.js
index 74af7b438..b1c0a19cf 100644
--- a/frontend/src/Artist/Details/ArtistDetails.js
+++ b/frontend/src/Artist/Details/ArtistDetails.js
@@ -6,6 +6,7 @@ import formatBytes from 'Utilities/Number/formatBytes';
 import selectAll from 'Utilities/Table/selectAll';
 import toggleSelected from 'Utilities/Table/toggleSelected';
 import { align, icons, kinds, sizes, tooltipPositions } from 'Helpers/Props';
+import fonts from 'Styles/Variables/fonts';
 import HeartRating from 'Components/HeartRating';
 import Icon from 'Components/Icon';
 import IconButton from 'Components/Link/IconButton';
@@ -31,33 +32,8 @@ import ArtistTagsConnector from './ArtistTagsConnector';
 import ArtistDetailsLinks from './ArtistDetailsLinks';
 import styles from './ArtistDetails.css';
 
-const albumTypes = [
-  {
-    name: 'album',
-    label: 'Album',
-    isVisible: true
-  },
-  {
-    name: 'ep',
-    label: 'EP',
-    isVisible: true
-  },
-  {
-    name: 'single',
-    label: 'Single',
-    isVisible: true
-  },
-  {
-    name: 'broadcast',
-    label: 'Broadcast',
-    isVisible: true
-  },
-  {
-    name: 'other',
-    label: 'Other',
-    isVisible: true
-  }
-];
+const defaultFontSize = parseInt(fonts.defaultFontSize);
+const lineHeight = parseFloat(fonts.lineHeight);
 
 function getFanartUrl(images) {
   const fanartImage = _.find(images, { coverType: 'fanart' });
@@ -174,6 +150,7 @@ class ArtistDetails extends Component {
       links,
       images,
       albums,
+      primaryAlbumTypes,
       alternateTitles,
       tags,
       isRefreshing,
@@ -475,11 +452,9 @@ class ArtistDetails extends Component {
 
                   }
                 </div>
-
-                <div>
+                <div className={styles.overview}>
                   <TextTruncate
-                    truncateText="…"
-                    line={8}
+                    line={Math.floor(200 / (defaultFontSize * lineHeight))}
                     text={overview}
                   />
                 </div>
@@ -495,26 +470,27 @@ class ArtistDetails extends Component {
 
             {
               !isFetching && episodesError &&
-                <div>Loading episodes failed</div>
+                <div>Loading albums failed</div>
             }
 
             {
               !isFetching && trackFilesError &&
-                <div>Loading episode files failed</div>
+                <div>Loading track files failed</div>
             }
 
             {
-              isPopulated && !!albumTypes.length &&
+              isPopulated && !!primaryAlbumTypes.length &&
                 <div>
                   {
-                    albumTypes.slice(0).map((season) => {
+                    primaryAlbumTypes.slice(0).map((albumType) => {
                       return (
                         <ArtistDetailsSeasonConnector
-                          key={season.name}
+                          key={albumType}
                           artistId={id}
-                          label={season.label}
-                          {...season}
-                          isExpanded={expandedState[season.name]}
+                          name={albumType}
+                          label={albumType}
+                          {...albumType}
+                          isExpanded={expandedState[albumType]}
                           onExpandPress={this.onExpandPress}
                         />
                       );
@@ -570,6 +546,7 @@ ArtistDetails.propTypes = {
   links: PropTypes.arrayOf(PropTypes.object).isRequired,
   images: PropTypes.arrayOf(PropTypes.object).isRequired,
   albums: PropTypes.arrayOf(PropTypes.object).isRequired,
+  primaryAlbumTypes: PropTypes.arrayOf(PropTypes.string).isRequired,
   alternateTitles: PropTypes.arrayOf(PropTypes.string).isRequired,
   tags: PropTypes.arrayOf(PropTypes.number).isRequired,
   isRefreshing: PropTypes.bool.isRequired,
diff --git a/frontend/src/Artist/Index/Overview/ArtistIndexOverview.css b/frontend/src/Artist/Index/Overview/ArtistIndexOverview.css
index cb1b3c0fb..c407524b9 100644
--- a/frontend/src/Artist/Index/Overview/ArtistIndexOverview.css
+++ b/frontend/src/Artist/Index/Overview/ArtistIndexOverview.css
@@ -47,7 +47,9 @@ $hoverScale: 1.05;
 }
 
 .info {
+  display: flex;
   flex: 1 0 1px;
+  flex-direction: column;
   overflow: hidden;
   padding-left: 10px;
 }
@@ -75,6 +77,7 @@ $hoverScale: 1.05;
 .details {
   display: flex;
   justify-content: space-between;
+  flex: 1 0 auto;
 }
 
 .overview {
@@ -82,6 +85,7 @@ $hoverScale: 1.05;
 
   flex: 0 1 1000px;
   overflow: hidden;
+  min-height: 0;
 }
 
 @media only screen and (max-width: $breakpointSmall) {
diff --git a/frontend/src/Artist/Index/Overview/ArtistIndexOverview.js b/frontend/src/Artist/Index/Overview/ArtistIndexOverview.js
index b1567fcff..692f59760 100644
--- a/frontend/src/Artist/Index/Overview/ArtistIndexOverview.js
+++ b/frontend/src/Artist/Index/Overview/ArtistIndexOverview.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Truncate from 'react-truncate';
+import TextTruncate from 'react-text-truncate';
 import { icons } from 'Helpers/Props';
 import dimensions from 'Styles/Variables/dimensions';
 import fonts from 'Styles/Variables/fonts';
@@ -176,16 +176,15 @@ class ArtistIndexOverview extends Component {
             </div>
 
             <div className={styles.details}>
+
               <Link
                 className={styles.overview}
-                style={{
-                  maxHeight: `${height}px`
-                }}
                 to={link}
               >
-                <Truncate lines={Math.floor(height / (defaultFontSize * lineHeight))}>
-                  {overview}
-                </Truncate>
+                <TextTruncate
+                  line={Math.floor(height / (defaultFontSize * lineHeight))}
+                  text={overview}
+                />
               </Link>
 
               <ArtistIndexOverviewInfo
diff --git a/frontend/src/Calendar/CalendarConnector.js b/frontend/src/Calendar/CalendarConnector.js
index a5a99f853..97d35671b 100644
--- a/frontend/src/Calendar/CalendarConnector.js
+++ b/frontend/src/Calendar/CalendarConnector.js
@@ -56,7 +56,9 @@ class CalendarConnector extends Component {
       const albumIds = selectUniqueIds(items, 'id');
       // const trackFileIds = selectUniqueIds(items, 'trackFileId');
 
-      this.props.fetchQueueDetails({ albumIds });
+      if (items.length) {
+        this.props.fetchQueueDetails({ albumIds });
+      }
 
       // if (trackFileIds.length) {
       //   this.props.fetchTrackFiles({ trackFileIds });
diff --git a/frontend/src/Components/Form/EnhancedSelectInputOption.css b/frontend/src/Components/Form/EnhancedSelectInputOption.css
index dedf7beaa..2b96de47f 100644
--- a/frontend/src/Components/Form/EnhancedSelectInputOption.css
+++ b/frontend/src/Components/Form/EnhancedSelectInputOption.css
@@ -27,6 +27,10 @@
   background-color: #aaa;
 }
 
+.isHidden {
+  display: none;
+}
+
 .isMobile {
   height: 50px;
   border-bottom: 1px solid $borderColor;
diff --git a/frontend/src/Components/Form/EnhancedSelectInputOption.js b/frontend/src/Components/Form/EnhancedSelectInputOption.js
index a1a161c79..e1b410c28 100644
--- a/frontend/src/Components/Form/EnhancedSelectInputOption.js
+++ b/frontend/src/Components/Form/EnhancedSelectInputOption.js
@@ -28,6 +28,7 @@ class EnhancedSelectInputOption extends Component {
       className,
       isSelected,
       isDisabled,
+      isHidden,
       isMobile,
       children
     } = this.props;
@@ -38,6 +39,7 @@ class EnhancedSelectInputOption extends Component {
           className,
           isSelected && styles.isSelected,
           isDisabled && styles.isDisabled,
+          isHidden && styles.isHidden,
           isMobile && styles.isMobile
         )}
         component="div"
@@ -64,6 +66,7 @@ EnhancedSelectInputOption.propTypes = {
   id: PropTypes.string.isRequired,
   isSelected: PropTypes.bool.isRequired,
   isDisabled: PropTypes.bool.isRequired,
+  isHidden: PropTypes.bool.isRequired,
   isMobile: PropTypes.bool.isRequired,
   children: PropTypes.node.isRequired,
   onSelect: PropTypes.func.isRequired
@@ -71,7 +74,8 @@ EnhancedSelectInputOption.propTypes = {
 
 EnhancedSelectInputOption.defaultProps = {
   className: styles.option,
-  isDisabled: false
+  isDisabled: false,
+  isHidden: false
 };
 
 export default EnhancedSelectInputOption;
diff --git a/frontend/src/Components/Form/FormGroup.css b/frontend/src/Components/Form/FormGroup.css
index 41a56eff0..ddce8863b 100644
--- a/frontend/src/Components/Form/FormGroup.css
+++ b/frontend/src/Components/Form/FormGroup.css
@@ -5,6 +5,10 @@
 
 /* Sizes */
 
+.extraSmall {
+  max-width: $formGroupExtraSmallWidth;
+}
+
 .small {
   max-width: $formGroupSmallWidth;
 }
diff --git a/frontend/src/Components/Form/FormGroup.js b/frontend/src/Components/Form/FormGroup.js
index edec4b86d..d2e04c350 100644
--- a/frontend/src/Components/Form/FormGroup.js
+++ b/frontend/src/Components/Form/FormGroup.js
@@ -41,7 +41,7 @@ function FormGroup(props) {
 FormGroup.propTypes = {
   className: PropTypes.string.isRequired,
   children: PropTypes.node.isRequired,
-  size: PropTypes.string.isRequired,
+  size: PropTypes.oneOf(sizes.all).isRequired,
   advancedSettings: PropTypes.bool.isRequired,
   isAdvanced: PropTypes.bool.isRequired
 };
diff --git a/frontend/src/Components/Form/FormLabel.css b/frontend/src/Components/Form/FormLabel.css
index ad175f202..b07ee230e 100644
--- a/frontend/src/Components/Form/FormLabel.css
+++ b/frontend/src/Components/Form/FormLabel.css
@@ -1,7 +1,6 @@
 .label {
   display: flex;
   justify-content: flex-end;
-  flex: 0 0 $formLabelWidth;
   margin-right: $formLabelRightMarginWidth;
   font-weight: bold;
   line-height: 35px;
@@ -20,3 +19,12 @@
     justify-content: flex-start;
   }
 }
+
+.small {
+  flex: 0 0 $formLabelSmallWidth;
+}
+
+.large {
+  flex: 0 0 $formLabelLargeWidth;
+}
+
diff --git a/frontend/src/Components/Form/FormLabel.js b/frontend/src/Components/Form/FormLabel.js
index dca800826..da7a443e3 100644
--- a/frontend/src/Components/Form/FormLabel.js
+++ b/frontend/src/Components/Form/FormLabel.js
@@ -1,12 +1,14 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import classNames from 'classnames';
+import { sizes } from 'Helpers/Props';
 import styles from './FormLabel.css';
 
 function FormLabel({
   children,
   className,
   errorClassName,
+  size,
   name,
   hasError,
   isAdvanced,
@@ -17,6 +19,7 @@ function FormLabel({
       {...otherProps}
       className={classNames(
         className,
+        styles[size],
         hasError && errorClassName,
         isAdvanced && styles.isAdvanced
       )}
@@ -31,6 +34,7 @@ FormLabel.propTypes = {
   children: PropTypes.node.isRequired,
   className: PropTypes.string,
   errorClassName: PropTypes.string,
+  size: PropTypes.oneOf(sizes.all),
   name: PropTypes.string,
   hasError: PropTypes.bool,
   isAdvanced: PropTypes.bool.isRequired
@@ -39,7 +43,8 @@ FormLabel.propTypes = {
 FormLabel.defaultProps = {
   className: styles.label,
   errorClassName: styles.hasError,
-  isAdvanced: false
+  isAdvanced: false,
+  size: sizes.LARGE
 };
 
 export default FormLabel;
diff --git a/frontend/src/Components/Form/RootFolderSelectInput.js b/frontend/src/Components/Form/RootFolderSelectInput.js
index 5cc27a72b..08d88e5f1 100644
--- a/frontend/src/Components/Form/RootFolderSelectInput.js
+++ b/frontend/src/Components/Form/RootFolderSelectInput.js
@@ -22,20 +22,19 @@ class RootFolderSelectInput extends Component {
   componentDidUpdate(prevProps) {
     const {
       name,
-      values,
       isSaving,
       saveError,
       onChange
     } = this.props;
 
+    const newRootFolderPath = this.state.newRootFolderPath;
+
     if (
       prevProps.isSaving &&
       !isSaving &&
       !saveError &&
-      values.length - prevProps.values.length === 1
+      newRootFolderPath
     ) {
-      const newRootFolderPath = this.state.newRootFolderPath;
-
       onChange({ name, value: newRootFolderPath });
       this.setState({ newRootFolderPath: '' });
     }
diff --git a/frontend/src/Components/Form/RootFolderSelectInputConnector.js b/frontend/src/Components/Form/RootFolderSelectInputConnector.js
index b9ba1a992..eb6e1e8e1 100644
--- a/frontend/src/Components/Form/RootFolderSelectInputConnector.js
+++ b/frontend/src/Components/Form/RootFolderSelectInputConnector.js
@@ -33,7 +33,8 @@ function createMapStateToProps() {
         values.push({
           key: '',
           value: '',
-          isDisabled: true
+          isDisabled: true,
+          isHidden: true
         });
       }
 
@@ -64,6 +65,18 @@ class RootFolderSelectInputConnector extends Component {
   //
   // Lifecycle
 
+  componentWillMount() {
+    const {
+      value,
+      values,
+      onChange
+    } = this.props;
+
+    if (value == null && values[0].key === '') {
+      onChange({ name, value: '' });
+    }
+  }
+
   componentDidMount() {
     const {
       name,
diff --git a/frontend/src/Components/Loading/LoadingMessage.js b/frontend/src/Components/Loading/LoadingMessage.js
index b27b49f00..1f7515ca7 100644
--- a/frontend/src/Components/Loading/LoadingMessage.js
+++ b/frontend/src/Components/Loading/LoadingMessage.js
@@ -12,9 +12,9 @@ const messages = [
   'Hum something loud while others stare',
   'Loading humorous message... Please Wait',
   'I could\'ve been faster in Python',
-  'Don\'t forget to rewind your episodes',
+  'Don\'t forget to rewind your tracks',
   'Congratulations! you are the 1000th visitor.',
-  'HELP!, I\'m being held hostage and forced to write these stupid lines!',
+  'HELP! I\'m being held hostage and forced to write these stupid lines!',
   'RE-calibrating the internet...',
   'I\'ll be here all week',
   'Don\'t forget to tip your waitress',
diff --git a/frontend/src/Components/Modal/Modal.css b/frontend/src/Components/Modal/Modal.css
index 4872a011e..2d2a7b9c5 100644
--- a/frontend/src/Components/Modal/Modal.css
+++ b/frontend/src/Components/Modal/Modal.css
@@ -51,6 +51,18 @@
   width: 1080px;
 }
 
+.extraLarge {
+  composes: modal;
+
+  width: 1440px;
+}
+
+@media only screen and (max-width: $breakpointExtraLarge) {
+  .modal.extraLarge {
+    width: 90%;
+  }
+}
+
 @media only screen and (max-width: $breakpointLarge) {
   .modal.large {
     width: 90%;
@@ -71,9 +83,10 @@
 
   .modal.small,
   .modal.medium,
-  .modal.large {
+  .modal.large,
+  .modal.extraLarge {
     max-height: 100%;
     width: 100%;
-    height: 100%;
+    height: 100% !important;
   }
 }
diff --git a/frontend/src/Components/Modal/Modal.js b/frontend/src/Components/Modal/Modal.js
index 1696da829..e4e221076 100644
--- a/frontend/src/Components/Modal/Modal.js
+++ b/frontend/src/Components/Modal/Modal.js
@@ -139,6 +139,7 @@ class Modal extends Component {
   render() {
     const {
       className,
+      style,
       backdropClassName,
       size,
       children,
@@ -166,6 +167,7 @@ class Modal extends Component {
                       className,
                       styles[size]
                     )}
+                    style={style}
                   >
                     {children}
                   </div>
@@ -180,6 +182,7 @@ class Modal extends Component {
 
 Modal.propTypes = {
   className: PropTypes.string,
+  style: PropTypes.object,
   backdropClassName: PropTypes.string,
   size: PropTypes.oneOf(sizes.all),
   children: PropTypes.node,
diff --git a/frontend/src/Components/Modal/ModalBody.css b/frontend/src/Components/Modal/ModalBody.css
index 2e55a91cb..ebeef29de 100644
--- a/frontend/src/Components/Modal/ModalBody.css
+++ b/frontend/src/Components/Modal/ModalBody.css
@@ -1,5 +1,3 @@
-$modalBodyPadding: 30px;
-
 .modalBody {
   flex: 1 0 1px;
   padding: $modalBodyPadding;
diff --git a/frontend/src/Components/Page/Header/PageHeader.js b/frontend/src/Components/Page/Header/PageHeader.js
index 2d6b3dbd6..02ad59887 100644
--- a/frontend/src/Components/Page/Header/PageHeader.js
+++ b/frontend/src/Components/Page/Header/PageHeader.js
@@ -23,13 +23,13 @@ class PageHeader extends Component {
   }
 
   componentDidMount() {
-    this.props.bindShortcut(shortcuts.OPEN_KEYBOARD_SHORTCUTS_MODAL.key, this.openKeyboardShortcutsModal);
+    this.props.bindShortcut(shortcuts.OPEN_KEYBOARD_SHORTCUTS_MODAL.key, this.onOpenKeyboardShortcutsModal);
   }
 
   //
   // Control
 
-  openKeyboardShortcutsModal = () => {
+  onOpenKeyboardShortcutsModal = () => {
     this.setState({ isKeyboardShortcutsModalOpen: true });
   }
 
@@ -76,7 +76,9 @@ class PageHeader extends Component {
             name={icons.HEART}
             to="https://lidarr.audio/donate.html"
           />
-          <PageHeaderActionsMenuConnector />
+          <PageHeaderActionsMenuConnector
+            onKeyboardShortcutsPress={this.onOpenKeyboardShortcutsModal}
+          />
         </div>
 
         <KeyboardShortcutsModal
diff --git a/frontend/src/Components/Page/Header/PageHeaderActionsMenu.js b/frontend/src/Components/Page/Header/PageHeaderActionsMenu.js
index a261c1b01..b60764f14 100644
--- a/frontend/src/Components/Page/Header/PageHeaderActionsMenu.js
+++ b/frontend/src/Components/Page/Header/PageHeaderActionsMenu.js
@@ -11,6 +11,7 @@ import styles from './PageHeaderActionsMenu.css';
 function PageHeaderActionsMenu(props) {
   const {
     formsAuth,
+    onKeyboardShortcutsPress,
     onRestartPress,
     onShutdownPress
   } = props;
@@ -25,6 +26,16 @@ function PageHeaderActionsMenu(props) {
         </MenuButton>
 
         <MenuContent>
+          <MenuItem onPress={onKeyboardShortcutsPress}>
+            <Icon
+              className={styles.itemIcon}
+              name={icons.KEYBOARD}
+            />
+            Keyboard Shortcuts
+          </MenuItem>
+
+          <div className={styles.separator} />
+
           <MenuItem onPress={onRestartPress}>
             <Icon
               className={styles.itemIcon}
@@ -68,6 +79,7 @@ function PageHeaderActionsMenu(props) {
 
 PageHeaderActionsMenu.propTypes = {
   formsAuth: PropTypes.bool.isRequired,
+  onKeyboardShortcutsPress: PropTypes.func.isRequired,
   onRestartPress: PropTypes.func.isRequired,
   onShutdownPress: PropTypes.func.isRequired
 };
diff --git a/frontend/src/Components/SignalRConnector.js b/frontend/src/Components/SignalRConnector.js
index 9aa8bc691..1093ef8d9 100644
--- a/frontend/src/Components/SignalRConnector.js
+++ b/frontend/src/Components/SignalRConnector.js
@@ -26,6 +26,14 @@ function getState(status) {
   }
 }
 
+function isAppDisconnected(disconnectedTime) {
+  if (!disconnectedTime) {
+    return false;
+  }
+
+  return Math.floor(new Date().getTime() / 1000) - disconnectedTime > 180;
+}
+
 function createMapStateToProps() {
   return createSelector(
     (state) => state.app.isReconnecting,
@@ -66,6 +74,7 @@ class SignalRConnector extends Component {
     this.signalRconnection = null;
     this.retryInterval = 5;
     this.retryTimeoutId = null;
+    this.disconnectedTime = null;
   }
 
   componentDidMount() {
@@ -90,7 +99,7 @@ class SignalRConnector extends Component {
   // Control
 
   retryConnection = () => {
-    if (this.retryInterval >= 30) {
+    if (isAppDisconnected(this.disconnectedTime)) {
       this.setState({
         isDisconnected: true
       });
@@ -290,6 +299,9 @@ class SignalRConnector extends Component {
     console.log(`SignalR: ${state}`);
 
     if (state === 'connected') {
+      // Clear disconnected time
+      this.disconnectedTime = null;
+
       // Repopulate the page (if a repopulator is set) to ensure things
       // are in sync after reconnecting.
 
@@ -322,6 +334,10 @@ class SignalRConnector extends Component {
       return;
     }
 
+    if (!this.disconnectedTime) {
+      this.disconnectedTime = Math.floor(new Date().getTime() / 1000);
+    }
+
     this.props.setAppValue({
       isReconnecting: true
     });
@@ -332,11 +348,14 @@ class SignalRConnector extends Component {
       return;
     }
 
+    if (!this.disconnectedTime) {
+      this.disconnectedTime = Math.floor(new Date().getTime() / 1000);
+    }
+
     this.props.setAppValue({
       isConnected: false,
-      isReconnecting: true
-      // Don't set isDisconnected yet, it'll be set it if it's disconnected
-      // for ~105 seconds (retry interval reaches 30 seconds)
+      isReconnecting: true,
+      isDisconnected: isAppDisconnected(this.disconnectedTime)
     });
 
     this.retryConnection();
diff --git a/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragPreview.js b/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragPreview.js
index 03169f00c..b1d016529 100644
--- a/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragPreview.js
+++ b/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragPreview.js
@@ -8,7 +8,7 @@ import TableOptionsColumn from './TableOptionsColumn';
 import styles from './TableOptionsColumnDragPreview.css';
 
 const formGroupSmallWidth = parseInt(dimensions.formGroupSmallWidth);
-const formLabelWidth = parseInt(dimensions.formLabelWidth);
+const formLabelLargeWidth = parseInt(dimensions.formLabelLargeWidth);
 const formLabelRightMarginWidth = parseInt(dimensions.formLabelRightMarginWidth);
 const dragHandleWidth = parseInt(dimensions.dragHandleWidth);
 
@@ -40,7 +40,7 @@ class TableOptionsColumnDragPreview extends Component {
     // list item and the preview is wider than the drag handle.
 
     const { x, y } = currentOffset;
-    const handleOffset = formGroupSmallWidth - formLabelWidth - formLabelRightMarginWidth - dragHandleWidth;
+    const handleOffset = formGroupSmallWidth - formLabelLargeWidth - formLabelRightMarginWidth - dragHandleWidth;
     const transform = `translate3d(${x - handleOffset}px, ${y}px, 0)`;
 
     const style = {
diff --git a/frontend/src/Components/Tooltip/Popover.js b/frontend/src/Components/Tooltip/Popover.js
index 0cb2520e5..bcd97854e 100644
--- a/frontend/src/Components/Tooltip/Popover.js
+++ b/frontend/src/Components/Tooltip/Popover.js
@@ -53,6 +53,14 @@ class Popover extends Component {
     this.state = {
       isOpen: false
     };
+
+    this._closeTimeout = null;
+  }
+
+  componentWillUnmount() {
+    if (this._closeTimeout) {
+      this._closeTimeout = clearTimeout(this._closeTimeout);
+    }
   }
 
   //
@@ -63,11 +71,17 @@ class Popover extends Component {
   }
 
   onMouseEnter = () => {
+    if (this._closeTimeout) {
+      this._closeTimeout = clearTimeout(this._closeTimeout);
+    }
+
     this.setState({ isOpen: true });
   }
 
   onMouseLeave = () => {
-    this.setState({ isOpen: false });
+    this._closeTimeout = setTimeout(() => {
+      this.setState({ isOpen: false });
+    }, 100);
   }
 
   //
@@ -98,24 +112,28 @@ class Popover extends Component {
 
         {
           this.state.isOpen &&
-            <div className={styles.popoverContainer}>
-              <div className={styles.popover}>
-                <div
-                  className={classNames(
-                    styles.arrow,
-                    styles[position]
-                  )}
-                />
-
-                <div className={styles.title}>
-                  {title}
-                </div>
-
-                <div className={styles.body}>
-                  {body}
-                </div>
+          <div
+            className={styles.popoverContainer}
+            onMouseEnter={this.onMouseEnter}
+            onMouseLeave={this.onMouseLeave}
+          >
+            <div className={styles.popover}>
+              <div
+                className={classNames(
+                  styles.arrow,
+                  styles[position]
+                )}
+              />
+
+              <div className={styles.title}>
+                {title}
+              </div>
+
+              <div className={styles.body}>
+                {body}
               </div>
             </div>
+          </div>
         }
       </TetherComponent>
     );
diff --git a/frontend/src/Components/Tooltip/Tooltip.js b/frontend/src/Components/Tooltip/Tooltip.js
index 5b32c5783..1f6be9cb7 100644
--- a/frontend/src/Components/Tooltip/Tooltip.js
+++ b/frontend/src/Components/Tooltip/Tooltip.js
@@ -50,11 +50,17 @@ class Tooltip extends Component {
   constructor(props, context) {
     super(props, context);
 
-    this._closeTimeout = null;
-
     this.state = {
       isOpen: false
     };
+
+    this._closeTimeout = null;
+  }
+
+  componentWillUnmount() {
+    if (this._closeTimeout) {
+      this._closeTimeout = clearTimeout(this._closeTimeout);
+    }
   }
 
   //
@@ -83,6 +89,7 @@ class Tooltip extends Component {
 
   render() {
     const {
+      className,
       anchor,
       tooltip,
       kind,
@@ -97,6 +104,7 @@ class Tooltip extends Component {
         {...tetherOptions[position]}
       >
         <span
+          className={className}
           // onClick={this.onClick}
           onMouseEnter={this.onMouseEnter}
           onMouseLeave={this.onMouseLeave}
@@ -137,6 +145,7 @@ class Tooltip extends Component {
 }
 
 Tooltip.propTypes = {
+  className: PropTypes.string,  
   anchor: PropTypes.node.isRequired,
   tooltip: PropTypes.oneOfType([PropTypes.string, PropTypes.node]).isRequired,
   kind: PropTypes.oneOf([kinds.DEFAULT, kinds.INVERSE]),
diff --git a/frontend/src/Helpers/Props/icons.js b/frontend/src/Helpers/Props/icons.js
index 65686cc8d..a84e6475e 100644
--- a/frontend/src/Helpers/Props/icons.js
+++ b/frontend/src/Helpers/Props/icons.js
@@ -36,11 +36,13 @@ export const FILE = 'fa fa-file-o';
 export const FILTER = 'fa fa-filter';
 export const FOLDER = 'fa fa-folder-o';
 export const FOLDER_OPEN = 'fa fa-folder-open';
+export const GROUP = 'fa fa-object-group';
 export const HEALTH = 'fa fa-medkit';
 export const HEART = 'fa fa-heart';
 export const HOUSEKEEPING = 'fa fa-home';
 export const INFO = 'fa fa-info-circle';
 export const INTERACTIVE = 'fa fa-user';
+export const KEYBOARD = 'fa fa-keyboard-o';
 export const LOGOUT = 'fa fa-sign-out';
 export const MISSING = 'fa fa-exclamation-triangle';
 export const MONITORED = 'fa fa-bookmark';
@@ -82,6 +84,7 @@ export const SUBTRACT = 'fa fa-minus';
 export const SYSTEM = 'fa fa-laptop';
 export const TAGS = 'fa fa-tags';
 export const TBA = 'fa fa-question-circle';
+export const UNGROUP = 'fa fa-object-ungroup';
 export const UNKNOWN = 'fa fa-question';
 export const UNMONITORED = 'fa fa-bookmark-o';
 export const UPDATE = 'fa fa-retweet';
diff --git a/frontend/src/Helpers/Props/sizes.js b/frontend/src/Helpers/Props/sizes.js
index e572e8fc8..d7f85df5e 100644
--- a/frontend/src/Helpers/Props/sizes.js
+++ b/frontend/src/Helpers/Props/sizes.js
@@ -1,5 +1,7 @@
+export const EXTRA_SMALL = 'extraSmall';
 export const SMALL = 'small';
 export const MEDIUM = 'medium';
 export const LARGE = 'large';
+export const EXTRA_LARGE = 'extraLarge';
 
-export const all = [SMALL, MEDIUM, LARGE];
+export const all = [EXTRA_SMALL, SMALL, MEDIUM, LARGE, EXTRA_LARGE];
diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.css b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.css
index 22234718f..e77a342f9 100644
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.css
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.css
@@ -4,8 +4,15 @@
   word-break: break-all;
 }
 
-.quality {
+.quality,
+.language {
   composes: cell from 'Components/Table/Cells/TableRowCell.css';
 
   text-align: center;
 }
+
+.label {
+  composes: label from 'Components/Label.css';
+
+  pointer-events: none;
+}
diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js
index 366c72aa8..556415b2f 100644
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js
@@ -238,6 +238,7 @@ class InteractiveImportRow extends Component {
           onPress={this.onSelectQualityPress}
         >
           <EpisodeQuality
+            className={styles.label}
             quality={quality}
           />
         </TableRowCellButton>
@@ -247,6 +248,7 @@ class InteractiveImportRow extends Component {
           onPress={this.onSelectLanguagePress}
         >
           <EpisodeLanguage
+            className={styles.label}
             language={language}
           />
         </TableRowCellButton>
diff --git a/frontend/src/InteractiveImport/Quality/SelectQualityModalContent.js b/frontend/src/InteractiveImport/Quality/SelectQualityModalContent.js
index 8649763a9..642e0433e 100644
--- a/frontend/src/InteractiveImport/Quality/SelectQualityModalContent.js
+++ b/frontend/src/InteractiveImport/Quality/SelectQualityModalContent.js
@@ -70,10 +70,10 @@ class SelectQualityModalContent extends Component {
       real
     } = this.state;
 
-    const qualityOptions = items.map(({ quality }) => {
+    const qualityOptions = items.map(({ id, name }) => {
       return {
-        key: quality.id,
-        value: quality.name
+        key: id,
+        value: name
       };
     });
 
diff --git a/frontend/src/InteractiveImport/Quality/SelectQualityModalContentConnector.js b/frontend/src/InteractiveImport/Quality/SelectQualityModalContentConnector.js
index ac5b42a7b..6ac07184d 100644
--- a/frontend/src/InteractiveImport/Quality/SelectQualityModalContentConnector.js
+++ b/frontend/src/InteractiveImport/Quality/SelectQualityModalContentConnector.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
+import getQualities from 'Utilities/Quality/getQualities';
 import { fetchQualityProfileSchema } from 'Store/Actions/settingsActions';
 import { updateInteractiveImportItem } from 'Store/Actions/interactiveImportActions';
 import SelectQualityModalContent from './SelectQualityModalContent';
@@ -22,7 +23,7 @@ function createMapStateToProps() {
         isFetching,
         isPopulated,
         error,
-        items: schema.items || []
+        items: getQualities(schema.items)
       };
     }
   );
diff --git a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
index 89b5a53a1..4708417fa 100644
--- a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
+++ b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
@@ -90,6 +90,15 @@ class NamingModal extends Component {
       { token: '{Album_CleanTitle}', example: 'Album_Title' }
     ];
 
+    const mediumTokens = [
+      { token: '{medium:0}', example: '1' },
+      { token: '{medium:00}', example: '01' }
+    ];
+
+    const mediumFormatTokens = [
+      { token: '{Medium Format}', example: 'CD' }
+    ];
+
     const trackTokens = [
       { token: '{track:0}', example: '1' },
       { token: '{track:00}', example: '01' }
@@ -260,6 +269,48 @@ class NamingModal extends Component {
             {
               track &&
                 <div>
+                  <FieldSet legend="Medium">
+                    <div className={styles.groups}>
+                      {
+                        mediumTokens.map(({ token, example }) => {
+                          return (
+                            <NamingOption
+                              key={token}
+                              name={name}
+                              value={value}
+                              token={token}
+                              example={example}
+                              tokenCase={this.state.case}
+                              onInputChange={onInputChange}
+                            />
+                          );
+                        }
+                        )
+                      }
+                    </div>
+                  </FieldSet>
+
+                  <FieldSet legend="Medium Format">
+                    <div className={styles.groups}>
+                      {
+                        mediumFormatTokens.map(({ token, example }) => {
+                          return (
+                            <NamingOption
+                              key={token}
+                              name={name}
+                              value={value}
+                              token={token}
+                              example={example}
+                              tokenCase={this.state.case}
+                              onInputChange={onInputChange}
+                            />
+                          );
+                        }
+                        )
+                      }
+                    </div>
+                  </FieldSet>
+
                   <FieldSet legend="Track">
                     <div className={styles.groups}>
                       {
diff --git a/frontend/src/Settings/Profiles/Language/LanguageProfileItemDragPreview.js b/frontend/src/Settings/Profiles/Language/LanguageProfileItemDragPreview.js
index 0b6b27d8e..ded14b39d 100644
--- a/frontend/src/Settings/Profiles/Language/LanguageProfileItemDragPreview.js
+++ b/frontend/src/Settings/Profiles/Language/LanguageProfileItemDragPreview.js
@@ -8,7 +8,7 @@ import LanguageProfileItem from './LanguageProfileItem';
 import styles from './LanguageProfileItemDragPreview.css';
 
 const formGroupSmallWidth = parseInt(dimensions.formGroupSmallWidth);
-const formLabelWidth = parseInt(dimensions.formLabelWidth);
+const formLabelLargeWidth = parseInt(dimensions.formLabelLargeWidth);
 const formLabelRightMarginWidth = parseInt(dimensions.formLabelRightMarginWidth);
 const dragHandleWidth = parseInt(dimensions.dragHandleWidth);
 
@@ -40,7 +40,7 @@ class LanguageProfileItemDragPreview extends Component {
     // list item and the preview is wider than the drag handle.
 
     const { x, y } = currentOffset;
-    const handleOffset = formGroupSmallWidth - formLabelWidth - formLabelRightMarginWidth - dragHandleWidth;
+    const handleOffset = formGroupSmallWidth - formLabelLargeWidth - formLabelRightMarginWidth - dragHandleWidth;
     const transform = `translate3d(${x - handleOffset}px, ${y}px, 0)`;
 
     const style = {
diff --git a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModal.js b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModal.js
index 13539e302..9ecbd1ca8 100644
--- a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModal.js
+++ b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModal.js
@@ -1,20 +1,56 @@
 import PropTypes from 'prop-types';
-import React from 'react';
+import React, { Component } from 'react';
+import { sizes } from 'Helpers/Props';
 import Modal from 'Components/Modal/Modal';
 import EditQualityProfileModalContentConnector from './EditQualityProfileModalContentConnector';
 
-function EditQualityProfileModal({ isOpen, onModalClose, ...otherProps }) {
-  return (
-    <Modal
-      isOpen={isOpen}
-      onModalClose={onModalClose}
-    >
-      <EditQualityProfileModalContentConnector
-        {...otherProps}
+class EditQualityProfileModal extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      height: 'auto'
+    };
+  }
+
+  //
+  // Listeners
+
+  onContentHeightChange = (height) => {
+    if (this.state.height === 'auto' || height > this.state.height) {
+      this.setState({ height });
+    }
+  }
+
+  //
+  // Render
+
+  render() {
+    const {
+      isOpen,
+      onModalClose,
+      ...otherProps
+    } = this.props;
+
+    return (
+      <Modal
+        style={{ height: `${this.state.height}px` }}
+        isOpen={isOpen}
+        size={sizes.EXTRA_LARGE}
         onModalClose={onModalClose}
-      />
-    </Modal>
-  );
+      >
+        <EditQualityProfileModalContentConnector
+          {...otherProps}
+          onContentHeightChange={this.onContentHeightChange}
+          onModalClose={onModalClose}
+        />
+      </Modal>
+    );
+  }
 }
 
 EditQualityProfileModal.propTypes = {
diff --git a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.css b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.css
index 74dd1c8b7..2f6589933 100644
--- a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.css
+++ b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.css
@@ -1,3 +1,18 @@
+.formGroupsContainer {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.formGroupWrapper {
+  flex: 0 0 calc($formGroupSmallWidth - 100px);
+}
+
 .deleteButtonContainer {
   margin-right: auto;
 }
+
+@media only screen and (max-width: $breakpointLarge) {
+  .formGroupsContainer {
+    display: block;
+  }
+}
diff --git a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js
index 21c504e4f..8ee7183fa 100644
--- a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js
+++ b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js
@@ -1,6 +1,8 @@
 import PropTypes from 'prop-types';
-import React from 'react';
-import { inputTypes, kinds } from 'Helpers/Props';
+import React, { Component } from 'react';
+import Measure from 'react-measure';
+import { inputTypes, kinds, sizes } from 'Helpers/Props';
+import dimensions from 'Styles/Variables/dimensions';
 import Button from 'Components/Link/Button';
 import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
@@ -15,123 +17,223 @@ import FormInputGroup from 'Components/Form/FormInputGroup';
 import QualityProfileItems from './QualityProfileItems';
 import styles from './EditQualityProfileModalContent.css';
 
-function EditQualityProfileModalContent(props) {
-  const {
-    isFetching,
-    error,
-    isSaving,
-    saveError,
-    qualities,
-    item,
-    isInUse,
-    onInputChange,
-    onCutoffChange,
-    onSavePress,
-    onModalClose,
-    onDeleteQualityProfilePress,
-    ...otherProps
-  } = props;
-
-  const {
-    id,
-    name,
-    cutoff,
-    items
-  } = item;
-
-  return (
-    <ModalContent onModalClose={onModalClose}>
-      <ModalHeader>
-        {id ? 'Edit Quality Profile' : 'Add Quality Profile'}
-      </ModalHeader>
-
-      <ModalBody>
-        {
-          isFetching &&
-            <LoadingIndicator />
-        }
-
-        {
-          !isFetching && !!error &&
-            <div>Unable to add a new quality profile, please try again.</div>
-        }
-
-        {
-          !isFetching && !error &&
-            <Form
-              {...otherProps}
-            >
-              <FormGroup>
-                <FormLabel>Name</FormLabel>
-
-                <FormInputGroup
-                  type={inputTypes.TEXT}
-                  name="name"
-                  {...name}
-                  onChange={onInputChange}
-                />
-              </FormGroup>
-
-              <FormGroup>
-                <FormLabel>Cutoff</FormLabel>
-
-                <FormInputGroup
-                  type={inputTypes.SELECT}
-                  name="cutoff"
-                  {...cutoff}
-                  value={cutoff ? cutoff.value.id : 0}
-                  values={qualities}
-                  helpText="Once this quality is reached Lidarr will no longer download episodes"
-                  onChange={onCutoffChange}
-                />
-              </FormGroup>
-
-              <QualityProfileItems
-                qualityProfileItems={items.value}
-                errors={items.errors}
-                warnings={items.warnings}
-                {...otherProps}
-              />
-
-            </Form>
-        }
-      </ModalBody>
-      <ModalFooter>
-        {
-          id &&
-            <div
-              className={styles.deleteButtonContainer}
-              title={isInUse && 'Can\'t delete a quality profile that is attached to a artist'}
-            >
-              <Button
-                kind={kinds.DANGER}
-                isDisabled={isInUse}
-                onPress={onDeleteQualityProfilePress}
-              >
-                Delete
-              </Button>
-            </div>
-        }
+const MODAL_BODY_PADDING = parseInt(dimensions.modalBodyPadding);
+
+class EditQualityProfileModalContent extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      headerHeight: 0,
+      bodyHeight: 0,
+      footerHeight: 0
+    };
+  }
+
+  componentDidUpdate(prevProps, prevState) {
+    const {
+      headerHeight,
+      bodyHeight,
+      footerHeight
+    } = this.state;
+
+    if (
+      headerHeight > 0 &&
+      bodyHeight > 0 &&
+      footerHeight > 0 &&
+      (
+        headerHeight !== prevState.headerHeight ||
+        bodyHeight !== prevState.bodyHeight ||
+        footerHeight !== prevState.footerHeight
+      )
+    ) {
+      const padding = MODAL_BODY_PADDING * 2;
+
+      this.props.onContentHeightChange(
+        headerHeight + bodyHeight + footerHeight + padding
+      );
+    }
+  }
+
+  //
+  // Listeners
+
+  onHeaderMeasure = ({ height }) => {
+    if (height > this.state.headerHeight) {
+      this.setState({ headerHeight: height });
+    }
+  }
+
+  onBodyMeasure = ({ height }) => {
+
+    if (height > this.state.bodyHeight) {
+      this.setState({ bodyHeight: height });
+    }
+  }
+
+  onFooterMeasure = ({ height }) => {
+    if (height > this.state.footerHeight) {
+      this.setState({ footerHeight: height });
+    }
+  }
+
+  //
+  // Render
 
-        <Button
-          onPress={onModalClose}
+  render() {
+    const {
+      editGroups,
+      isFetching,
+      error,
+      isSaving,
+      saveError,
+      qualities,
+      item,
+      isInUse,
+      onInputChange,
+      onCutoffChange,
+      onSavePress,
+      onModalClose,
+      onDeleteQualityProfilePress,
+      ...otherProps
+    } = this.props;
+
+    const {
+      id,
+      name,
+      cutoff,
+      items
+    } = item;
+
+    return (
+      <ModalContent onModalClose={onModalClose}>
+        <Measure
+          whitelist={['height']}
+          includeMargin={false}
+          onMeasure={this.onHeaderMeasure}
         >
-          Cancel
-        </Button>
+          <ModalHeader>
+            {id ? 'Edit Quality Profile' : 'Add Quality Profile'}
+          </ModalHeader>
+        </Measure>
+
+        <ModalBody>
+          <Measure
+            whitelist={['height']}
+            onMeasure={this.onBodyMeasure}
+          >
+            <div>
+              {
+                isFetching &&
+                  <LoadingIndicator />
+              }
+
+              {
+                !isFetching && !!error &&
+                  <div>Unable to add a new quality profile, please try again.</div>
+              }
+
+              {
+                !isFetching && !error &&
+                  <Form
+                    {...otherProps}
+                  >
+                    <div className={styles.formGroupsContainer}>
+                      <div className={styles.formGroupWrapper}>
+                        <FormGroup size={sizes.EXTRA_SMALL}>
+                          <FormLabel size={sizes.small}>
+                            Name
+                          </FormLabel>
+
+                          <FormInputGroup
+                            type={inputTypes.TEXT}
+                            name="name"
+                            {...name}
+                            onChange={onInputChange}
+                          />
+                        </FormGroup>
+
+                        <FormGroup size={sizes.EXTRA_SMALL}>
+                          <FormLabel size={sizes.small}>
+                            Cutoff
+                          </FormLabel>
+
+                          <FormInputGroup
+                            type={inputTypes.SELECT}
+                            name="cutoff"
+                            {...cutoff}
+                            values={qualities}
+                            helpText="Once this quality is reached Sonarr will no longer download episodes"
+                            onChange={onCutoffChange}
+                          />
+                        </FormGroup>
+                      </div>
 
-        <SpinnerErrorButton
-          isSpinning={isSaving}
-          error={saveError}
-          onPress={onSavePress}
+                      <div className={styles.formGroupWrapper}>
+                        <QualityProfileItems
+                          editGroups={editGroups}
+                          qualityProfileItems={items.value}
+                          errors={items.errors}
+                          warnings={items.warnings}
+                          {...otherProps}
+                        />
+                      </div>
+                    </div>
+                  </Form>
+
+              }
+            </div>
+          </Measure>
+        </ModalBody>
+
+        <Measure
+          whitelist={['height']}
+          includeMargin={false}
+          onMeasure={this.onFooterMeasure}
         >
-          Save
-        </SpinnerErrorButton>
-      </ModalFooter>
-    </ModalContent>
-  );
+          <ModalFooter>
+            {
+              id &&
+                <div
+                  className={styles.deleteButtonContainer}
+                  title={isInUse && 'Can\'t delete a quality profile that is attached to a series'}
+                >
+                  <Button
+                    kind={kinds.DANGER}
+                    isDisabled={isInUse}
+                    onPress={onDeleteQualityProfilePress}
+                  >
+                    Delete
+                  </Button>
+                </div>
+            }
+
+            <Button
+              onPress={onModalClose}
+            >
+              Cancel
+            </Button>
+
+            <SpinnerErrorButton
+              isSpinning={isSaving}
+              error={saveError}
+              onPress={onSavePress}
+            >
+              Save
+            </SpinnerErrorButton>
+          </ModalFooter>
+        </Measure>
+      </ModalContent>
+    );
+  }
 }
 
 EditQualityProfileModalContent.propTypes = {
+  editGroups: PropTypes.bool.isRequired,
   isFetching: PropTypes.bool.isRequired,
   error: PropTypes.object,
   isSaving: PropTypes.bool.isRequired,
@@ -142,6 +244,7 @@ EditQualityProfileModalContent.propTypes = {
   onInputChange: PropTypes.func.isRequired,
   onCutoffChange: PropTypes.func.isRequired,
   onSavePress: PropTypes.func.isRequired,
+  onContentHeightChange: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired,
   onDeleteQualityProfilePress: PropTypes.func
 };
diff --git a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContentConnector.js b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContentConnector.js
index 9de5080ca..c06392fe1 100644
--- a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContentConnector.js
+++ b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContentConnector.js
@@ -8,6 +8,29 @@ import { fetchQualityProfileSchema, setQualityProfileValue, saveQualityProfile }
 import connectSection from 'Store/connectSection';
 import EditQualityProfileModalContent from './EditQualityProfileModalContent';
 
+function getQualityItemGroupId(qualityProfile) {
+  // Get items with an `id` and filter out null/undefined values
+  const ids = _.filter(_.map(qualityProfile.items.value, 'id'), (i) => i != null);
+
+  return Math.max(1000, ...ids) + 1;
+}
+
+function parseIndex(index) {
+  const split = index.split('.');
+
+  if (split.length === 1) {
+    return [
+      null,
+      parseInt(split[0]) - 1
+    ];
+  }
+
+  return [
+    parseInt(split[0]) - 1,
+    parseInt(split[1]) - 1
+  ];
+}
+
 function createQualitiesSelector() {
   return createSelector(
     createProviderSettingsSelector(),
@@ -17,12 +40,19 @@ function createQualitiesSelector() {
         return [];
       }
 
-      return _.reduceRight(items.value, (result, { allowed, quality }) => {
+      return _.reduceRight(items.value, (result, { allowed, id, name, quality }) => {
         if (allowed) {
-          result.push({
-            key: quality.id,
-            value: quality.name
-          });
+          if (id) {
+            result.push({
+              key: id,
+              value: name
+            });
+          } else {
+            result.push({
+              key: quality.id,
+              value: quality.name
+            });
+          }
         }
 
         return result;
@@ -61,8 +91,10 @@ class EditQualityProfileModalContentConnector extends Component {
     super(props, context);
 
     this.state = {
-      dragIndex: null,
-      dropIndex: null
+      dragQualityIndex: null,
+      dropQualityIndex: null,
+      dropPosition: null,
+      editGroups: true
     };
   }
 
@@ -78,6 +110,33 @@ class EditQualityProfileModalContentConnector extends Component {
     }
   }
 
+  //
+  // Control
+
+  ensureCutoff = (qualityProfile) => {
+    const cutoff = qualityProfile.cutoff.value;
+
+    const cutoffItem = _.find(qualityProfile.items.value, (i) => {
+      if (!cutoff) {
+        return false;
+      }
+
+      return i.id === cutoff || (i.quality && i.quality.id === cutoff);
+    });
+
+    // If the cutoff isn't allowed anymore or there isn't a cutoff set one
+    if (!cutoff || !cutoffItem || !cutoffItem.allowed) {
+      const firstAllowed = _.find(qualityProfile.items.value, { allowed: true });
+      let cutoffId = null;
+
+      if (firstAllowed) {
+        cutoffId = firstAllowed.quality ? firstAllowed.quality.id : firstAllowed.id;
+      }
+
+      this.props.setQualityProfileValue({ name: 'cutoff', value: cutoffId });
+    }
+  }
+
   //
   // Listeners
 
@@ -87,9 +146,17 @@ class EditQualityProfileModalContentConnector extends Component {
 
   onCutoffChange = ({ name, value }) => {
     const id = parseInt(value);
-    const item = _.find(this.props.item.items.value, (i) => i.quality.id === id);
+    const item = _.find(this.props.item.items.value, (i) => {
+      if (i.quality) {
+        return i.quality.id === id;
+      }
+
+      return i.id === id;
+    });
 
-    this.props.setQualityProfileValue({ name, value: item.quality });
+    const cutoffId = item.quality ? item.quality.id : item.id;
+
+    this.props.setQualityProfileValue({ name, value: cutoffId });
   }
 
   onSavePress = () => {
@@ -98,58 +165,239 @@ class EditQualityProfileModalContentConnector extends Component {
 
   onQualityProfileItemAllowedChange = (id, allowed) => {
     const qualityProfile = _.cloneDeep(this.props.item);
+    const items = qualityProfile.items.value;
+    const item = _.find(qualityProfile.items.value, (i) => i.quality && i.quality.id === id);
 
-    const item = _.find(qualityProfile.items.value, (i) => i.quality.id === id);
     item.allowed = allowed;
 
     this.props.setQualityProfileValue({
       name: 'items',
-      value: qualityProfile.items.value
+      value: items
     });
 
-    const cutoff = qualityProfile.cutoff.value;
+    this.ensureCutoff(qualityProfile);
+  }
 
-    // If the cutoff isn't allowed anymore or there isn't a cutoff set one
-    if (!cutoff || !_.find(qualityProfile.items.value, (i) => i.quality.id === cutoff.id).allowed) {
-      const firstAllowed = _.find(qualityProfile.items.value, { allowed: true });
+  onItemGroupAllowedChange = (id, allowed) => {
+    const qualityProfile = _.cloneDeep(this.props.item);
+    const items = qualityProfile.items.value;
+    const item = _.find(qualityProfile.items.value, (i) => i.id === id);
 
-      this.props.setQualityProfileValue({ name: 'cutoff', value: firstAllowed ? firstAllowed.quality : null });
-    }
+    item.allowed = allowed;
+
+    // Update each item in the group (for consistency only)
+    item.items.forEach((i) => {
+      i.allowed = allowed;
+    });
+
+    this.props.setQualityProfileValue({
+      name: 'items',
+      value: items
+    });
+
+    this.ensureCutoff(qualityProfile);
+  }
+
+  onItemGroupNameChange = (id, name) => {
+    const qualityProfile = _.cloneDeep(this.props.item);
+    const items = qualityProfile.items.value;
+    const group = _.find(items, (i) => i.id === id);
+
+    group.name = name;
+
+    this.props.setQualityProfileValue({
+      name: 'items',
+      value: items
+    });
+  }
+
+  onCreateGroupPress = (id) => {
+    const qualityProfile = _.cloneDeep(this.props.item);
+    const items = qualityProfile.items.value;
+    const item = _.find(items, (i) => i.quality && i.quality.id === id);
+    const index = items.indexOf(item);
+    const groupId = getQualityItemGroupId(qualityProfile);
+
+    const group = {
+      id: groupId,
+      name: item.quality.name,
+      allowed: item.allowed,
+      items: [
+        item
+      ]
+    };
+
+    // Add the group in the same location the quality item was in.
+    items.splice(index, 1, group);
+
+    this.props.setQualityProfileValue({
+      name: 'items',
+      value: items
+    });
+
+    this.ensureCutoff(qualityProfile);
+  }
+
+  onDeleteGroupPress = (id) => {
+    const qualityProfile = _.cloneDeep(this.props.item);
+    const items = qualityProfile.items.value;
+    const group = _.find(items, (i) => i.id === id);
+    const index = items.indexOf(group);
+
+    // Add the items in the same location the group was in
+    items.splice(index, 1, ...group.items);
+
+    this.props.setQualityProfileValue({
+      name: 'items',
+      value: items
+    });
+
+    this.ensureCutoff(qualityProfile);
   }
 
-  onQualityProfileItemDragMove = (dragIndex, dropIndex) => {
-    if (this.state.dragIndex !== dragIndex || this.state.dropIndex !== dropIndex) {
+  onQualityProfileItemDragMove = (options) => {
+    const {
+      dragQualityIndex,
+      dropQualityIndex,
+      dropPosition
+    } = options;
+
+    const [dragGroupIndex, dragItemIndex] = parseIndex(dragQualityIndex);
+    const [dropGroupIndex, dropItemIndex] = parseIndex(dropQualityIndex);
+
+    if (
+      (dropPosition === 'below' && dropItemIndex - 1 === dragItemIndex) ||
+      (dropPosition === 'above' && dropItemIndex + 1 === dragItemIndex)
+    ) {
+      if (
+        this.state.dragQualityIndex != null &&
+        this.state.dropQualityIndex != null &&
+        this.state.dropPosition != null
+      ) {
+        this.setState({
+          dragQualityIndex: null,
+          dropQualityIndex: null,
+          dropPosition: null
+        });
+      }
+
+      return;
+    }
+
+    let adjustedDropQualityIndex = dropQualityIndex;
+
+    // Correct dragging out of a group to the position above
+    if (
+      dropPosition === 'above' &&
+      dragGroupIndex !== dropGroupIndex &&
+      dropGroupIndex != null
+    ) {
+      // Add 1 to the group index and 2 to the item index so it's inserted above in the correct group
+      adjustedDropQualityIndex = `${dropGroupIndex + 1}.${dropItemIndex + 2}`;
+    }
+
+    // Correct inserting above outside a group
+    if (
+      dropPosition === 'above' &&
+      dragGroupIndex !== dropGroupIndex &&
+      dropGroupIndex == null
+    ) {
+      // Add 2 to the item index so it's entered in the correct place
+      adjustedDropQualityIndex = `${dropItemIndex + 2}`;
+    }
+
+    // Correct inserting below a quality within the same group (when moving a lower item)
+    if (
+      dropPosition === 'below' &&
+      dragGroupIndex === dropGroupIndex &&
+      dropGroupIndex != null &&
+      dragItemIndex < dropItemIndex
+    ) {
+      // Add 1 to the group index leave the item index
+      adjustedDropQualityIndex = `${dropGroupIndex + 1}.${dropItemIndex}`;
+    }
+
+    // Correct inserting below a quality outside a group (when moving a lower item)
+    if (
+      dropPosition === 'below' &&
+      dragGroupIndex === dropGroupIndex &&
+      dropGroupIndex == null &&
+      dragItemIndex < dropItemIndex
+    ) {
+      // Leave the item index so it's inserted below the item
+      adjustedDropQualityIndex = `${dropItemIndex}`;
+    }
+
+    if (
+      dragQualityIndex !== this.state.dragQualityIndex ||
+      adjustedDropQualityIndex !== this.state.dropQualityIndex ||
+      dropPosition !== this.state.dropPosition
+    ) {
       this.setState({
-        dragIndex,
-        dropIndex
+        dragQualityIndex,
+        dropQualityIndex: adjustedDropQualityIndex,
+        dropPosition
       });
     }
   }
 
-  onQualityProfileItemDragEnd = ({ id }, didDrop) => {
+  onQualityProfileItemDragEnd = (didDrop) => {
     const {
-      dragIndex,
-      dropIndex
+      dragQualityIndex,
+      dropQualityIndex
     } = this.state;
 
-    if (didDrop && dropIndex !== null) {
+    if (didDrop && dropQualityIndex != null) {
       const qualityProfile = _.cloneDeep(this.props.item);
+      const items = qualityProfile.items.value;
+      const [dragGroupIndex, dragItemIndex] = parseIndex(dragQualityIndex);
+      const [dropGroupIndex, dropItemIndex] = parseIndex(dropQualityIndex);
 
-      const items = qualityProfile.items.value.splice(dragIndex, 1);
-      qualityProfile.items.value.splice(dropIndex, 0, items[0]);
+      let item = null;
+      let dropGroup = null;
+
+      // Get the group before moving anything so we know the correct place to drop it.
+      if (dropGroupIndex != null) {
+        dropGroup = items[dropGroupIndex];
+      }
+
+      if (dragGroupIndex == null) {
+        item = items.splice(dragItemIndex, 1)[0];
+      } else {
+        const group = items[dragGroupIndex];
+        item = group.items.splice(dragItemIndex, 1)[0];
+
+        // If the group is now empty, destroy it.
+        if (!group.items.length) {
+          items.splice(dragGroupIndex, 1);
+        }
+      }
+
+      if (dropGroupIndex == null) {
+        items.splice(dropItemIndex, 0, item);
+      } else {
+        dropGroup.items.splice(dropItemIndex, 0, item);
+      }
 
       this.props.setQualityProfileValue({
         name: 'items',
-        value: qualityProfile.items.value
+        value: items
       });
+
+      this.ensureCutoff(qualityProfile);
     }
 
     this.setState({
-      dragIndex: null,
-      dropIndex: null
+      dragQualityIndex: null,
+      dropQualityIndex: null,
+      dropPosition: null
     });
   }
 
+  onToggleEditGroupsMode = () => {
+    this.setState({ editGroups: !this.state.editGroups });
+  }
+
   //
   // Render
 
@@ -165,9 +413,14 @@ class EditQualityProfileModalContentConnector extends Component {
         onSavePress={this.onSavePress}
         onInputChange={this.onInputChange}
         onCutoffChange={this.onCutoffChange}
+        onCreateGroupPress={this.onCreateGroupPress}
+        onDeleteGroupPress={this.onDeleteGroupPress}
         onQualityProfileItemAllowedChange={this.onQualityProfileItemAllowedChange}
+        onItemGroupAllowedChange={this.onItemGroupAllowedChange}
+        onItemGroupNameChange={this.onItemGroupNameChange}
         onQualityProfileItemDragMove={this.onQualityProfileItemDragMove}
         onQualityProfileItemDragEnd={this.onQualityProfileItemDragEnd}
+        onToggleEditGroupsMode={this.onToggleEditGroupsMode}
       />
     );
   }
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfile.css b/frontend/src/Settings/Profiles/Quality/QualityProfile.css
index 1ac9041bd..02a5999cc 100644
--- a/frontend/src/Settings/Profiles/Quality/QualityProfile.css
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfile.css
@@ -17,3 +17,10 @@
   flex-wrap: wrap;
   margin-top: 5px;
 }
+
+.tooltipLabel {
+  composes: label from 'Components/Label.css';
+
+  margin: 0;
+  border: none;
+}
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfile.js b/frontend/src/Settings/Profiles/Quality/QualityProfile.js
index 211656ab1..8fe5810f5 100644
--- a/frontend/src/Settings/Profiles/Quality/QualityProfile.js
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfile.js
@@ -1,9 +1,10 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { kinds } from 'Helpers/Props';
+import { kinds, tooltipPositions } from 'Helpers/Props';
 import Card from 'Components/Card';
 import Label from 'Components/Label';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
+import Tooltip from 'Components/Tooltip/Tooltip';
 import EditQualityProfileModalConnector from './EditQualityProfileModalConnector';
 import styles from './QualityProfile.css';
 
@@ -75,16 +76,54 @@ class QualityProfile extends Component {
                 return null;
               }
 
-              const isCutoff = item.quality.id === cutoff.id;
+              if (item.quality) {
+                const isCutoff = item.quality.id === cutoff;
+
+                return (
+                  <Label
+                    key={item.quality.id}
+                    kind={isCutoff ? kinds.INFO : kinds.default}
+                    title={isCutoff ? 'Cutoff' : null}
+                  >
+                    {item.quality.name}
+                  </Label>
+                );
+              }
+
+              const isCutoff = item.id === cutoff;
 
               return (
-                <Label
-                  key={item.quality.id}
-                  kind={isCutoff ? kinds.INFO : kinds.default}
-                  title={isCutoff ? 'Cutoff' : null}
-                >
-                  {item.quality.name}
-                </Label>
+                <Tooltip
+                  key={item.id}
+                  className={styles.tooltipLabel}
+                  anchor={
+                    <Label
+                      kind={isCutoff ? kinds.INFO : kinds.default}
+                      title={isCutoff ? 'Cutoff' : null}
+                    >
+                      {item.name}
+                    </Label>
+                  }
+                  tooltip={
+                    <div>
+                      {
+                        item.items.map((groupItem) => {
+                          return (
+                            <Label
+                              key={groupItem.quality.id}
+                              kind={isCutoff ? kinds.INFO : kinds.default}
+                              title={isCutoff ? 'Cutoff' : null}
+                            >
+                              {groupItem.quality.name}
+                            </Label>
+                          );
+                        })
+                      }
+                    </div>
+                  }
+                  kind={kinds.INVERSE}
+                  position={tooltipPositions.TOP}
+                />
               );
             })
           }
@@ -115,7 +154,7 @@ class QualityProfile extends Component {
 QualityProfile.propTypes = {
   id: PropTypes.number.isRequired,
   name: PropTypes.string.isRequired,
-  cutoff: PropTypes.object.isRequired,
+  cutoff: PropTypes.number.isRequired,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   isDeleting: PropTypes.bool.isRequired,
   onConfirmDeleteQualityProfile: PropTypes.func.isRequired
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileItem.css b/frontend/src/Settings/Profiles/Quality/QualityProfileItem.css
index 90d48a2c5..7e6370ff8 100644
--- a/frontend/src/Settings/Profiles/Quality/QualityProfileItem.css
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfileItem.css
@@ -5,25 +5,56 @@
   border: 1px solid #aaa;
   border-radius: 4px;
   background: #fafafa;
+
+  &.isInGroup {
+    border-style: dashed;
+  }
 }
 
-.checkContainer {
+.checkInputContainer {
   position: relative;
   margin-right: 4px;
-  margin-bottom: 7px;
+  margin-bottom: 5px;
   margin-left: 8px;
 }
 
-.qualityName {
+.checkInput {
+  composes: input from 'Components/Form/CheckInput.css';
+
+  margin-top: 5px;
+}
+
+.qualityNameContainer {
   display: flex;
   flex-grow: 1;
   margin-bottom: 0;
   margin-left: 2px;
   font-weight: normal;
-  line-height: 36px;
+  line-height: $qualityProfileItemHeight;
   cursor: pointer;
 }
 
+.qualityName {
+  &.isInGroup {
+    margin-left: 14px;
+  }
+
+  &.notAllowed {
+    color: #c6c6c6;
+  }
+}
+
+.createGroupButton {
+  composes: buton from 'Components/Link/IconButton.css';
+
+  display: flex;
+  justify-content: center;
+  flex-shrink: 0;
+  margin-right: 5px;
+  margin-left: 8px;
+  width: 20px;
+}
+
 .dragHandle {
   display: flex;
   align-items: center;
@@ -42,3 +73,13 @@
 .isDragging {
   opacity: 0.25;
 }
+
+.isPreview {
+  .qualityName {
+    margin-left: 14px;
+
+    &.isInGroup {
+      margin-left: 28px;
+    }
+  }
+}
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileItem.js b/frontend/src/Settings/Profiles/Quality/QualityProfileItem.js
index 1a0fa0114..8161e7061 100644
--- a/frontend/src/Settings/Profiles/Quality/QualityProfileItem.js
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfileItem.js
@@ -3,6 +3,7 @@ import React, { Component } from 'react';
 import classNames from 'classnames';
 import { icons } from 'Helpers/Props';
 import Icon from 'Components/Icon';
+import IconButton from 'Components/Link/IconButton';
 import CheckInput from 'Components/Form/CheckInput';
 import styles from './QualityProfileItem.css';
 
@@ -20,14 +21,27 @@ class QualityProfileItem extends Component {
     onQualityProfileItemAllowedChange(qualityId, value);
   }
 
+  onCreateGroupPress = () => {
+    const {
+      qualityId,
+      onCreateGroupPress
+    } = this.props;
+
+    onCreateGroupPress(qualityId);
+  }
+
   //
   // Render
 
   render() {
     const {
+      editGroups,
+      isPreview,
+      groupId,
       name,
       allowed,
       isDragging,
+      isOverCurrent,
       connectDragSource
     } = this.props;
 
@@ -36,18 +50,44 @@ class QualityProfileItem extends Component {
         className={classNames(
           styles.qualityProfileItem,
           isDragging && styles.isDragging,
+          isPreview && styles.isPreview,
+          isOverCurrent && styles.isOverCurrent,
+          groupId && styles.isInGroup
         )}
       >
         <label
-          className={styles.qualityName}
+          className={styles.qualityNameContainer}
         >
-          <CheckInput
-            containerClassName={styles.checkContainer}
-            name={name}
-            value={allowed}
-            onChange={this.onAllowedChange}
-          />
-          {name}
+          {
+            editGroups && !groupId && !isPreview &&
+              <IconButton
+                className={styles.createGroupButton}
+                name={icons.GROUP}
+                title="Group"
+                onPress={this.onCreateGroupPress}
+              />
+          }
+
+          {
+            !editGroups &&
+              <CheckInput
+                className={styles.checkInput}
+                containerClassName={styles.checkInputContainer}
+                name={name}
+                value={allowed}
+                isDisabled={!!groupId}
+                onChange={this.onAllowedChange}
+              />
+          }
+
+          <div className={classNames(
+            styles.qualityName,
+            groupId && styles.isInGroup,
+            !allowed && styles.notAllowed
+          )}
+          >
+            {name}
+          </div>
         </label>
 
         {
@@ -55,6 +95,7 @@ class QualityProfileItem extends Component {
             <div className={styles.dragHandle}>
               <Icon
                 className={styles.dragIcon}
+                title="Create group"
                 name={icons.REORDER}
               />
             </div>
@@ -66,16 +107,23 @@ class QualityProfileItem extends Component {
 }
 
 QualityProfileItem.propTypes = {
+  editGroups: PropTypes.bool,
+  isPreview: PropTypes.bool,
+  groupId: PropTypes.number,
   qualityId: PropTypes.number.isRequired,
   name: PropTypes.string.isRequired,
   allowed: PropTypes.bool.isRequired,
-  sortIndex: PropTypes.number.isRequired,
   isDragging: PropTypes.bool.isRequired,
+  isOverCurrent: PropTypes.bool.isRequired,
+  isInGroup: PropTypes.bool,
   connectDragSource: PropTypes.func,
+  onCreateGroupPress: PropTypes.func,
   onQualityProfileItemAllowedChange: PropTypes.func
 };
 
 QualityProfileItem.defaultProps = {
+  isPreview: false,
+  isOverCurrent: false,
   // The drag preview will not connect the drag handle.
   connectDragSource: (node) => node
 };
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragPreview.js b/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragPreview.js
index 1fd249714..e0c6e8e8c 100644
--- a/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragPreview.js
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragPreview.js
@@ -7,8 +7,8 @@ import DragPreviewLayer from 'Components/DragPreviewLayer';
 import QualityProfileItem from './QualityProfileItem';
 import styles from './QualityProfileItemDragPreview.css';
 
-const formGroupSmallWidth = parseInt(dimensions.formGroupSmallWidth);
-const formLabelWidth = parseInt(dimensions.formLabelWidth);
+const formGroupExtraSmallWidth = parseInt(dimensions.formGroupExtraSmallWidth);
+const formLabelSmallWidth = parseInt(dimensions.formLabelSmallWidth);
 const formLabelRightMarginWidth = parseInt(dimensions.formLabelRightMarginWidth);
 const dragHandleWidth = parseInt(dimensions.dragHandleWidth);
 
@@ -40,7 +40,7 @@ class QualityProfileItemDragPreview extends Component {
     // list item and the preview is wider than the drag handle.
 
     const { x, y } = currentOffset;
-    const handleOffset = formGroupSmallWidth - formLabelWidth - formLabelRightMarginWidth - dragHandleWidth;
+    const handleOffset = formGroupExtraSmallWidth - formLabelSmallWidth - formLabelRightMarginWidth - dragHandleWidth;
     const transform = `translate3d(${x - handleOffset}px, ${y}px, 0)`;
 
     const style = {
@@ -51,12 +51,15 @@ class QualityProfileItemDragPreview extends Component {
     };
 
     const {
+      editGroups,
+      groupId,
       qualityId,
       name,
-      allowed,
-      sortIndex
+      allowed
     } = item;
 
+    // TODO: Show a different preview for groups
+
     return (
       <DragPreviewLayer>
         <div
@@ -64,10 +67,11 @@ class QualityProfileItemDragPreview extends Component {
           style={style}
         >
           <QualityProfileItem
-            qualityId={qualityId}
+            editGroups={editGroups}
+            isPreview={true}
+            qualityId={groupId || qualityId}
             name={name}
             allowed={allowed}
-            sortIndex={sortIndex}
             isDragging={false}
           />
         </div>
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragSource.css b/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragSource.css
index 5b9f36fe9..d5061cc95 100644
--- a/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragSource.css
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragSource.css
@@ -1,10 +1,10 @@
 .qualityProfileItemDragSource {
-  padding: 4px 0;
+  padding: $qualityProfileItemDragSourcePadding 0;
 }
 
 .qualityProfileItemPlaceholder {
   width: 100%;
-  height: 36px;
+  height: $qualityProfileItemHeight;
   border: 1px dotted #aaa;
   border-radius: 4px;
 }
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragSource.js b/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragSource.js
index ed8adc107..0e1838eb3 100644
--- a/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragSource.js
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragSource.js
@@ -5,44 +5,86 @@ import { DragSource, DropTarget } from 'react-dnd';
 import classNames from 'classnames';
 import { QUALITY_PROFILE_ITEM } from 'Helpers/dragTypes';
 import QualityProfileItem from './QualityProfileItem';
+import QualityProfileItemGroup from './QualityProfileItemGroup';
 import styles from './QualityProfileItemDragSource.css';
 
 const qualityProfileItemDragSource = {
-  beginDrag({ qualityId, name, allowed, sortIndex }) {
+  beginDrag(props) {
+    const {
+      editGroups,
+      qualityIndex,
+      groupId,
+      qualityId,
+      name,
+      allowed
+    } = props;
+
     return {
+      editGroups,
+      qualityIndex,
+      groupId,
       qualityId,
+      isGroup: !qualityId,
       name,
-      allowed,
-      sortIndex
+      allowed
     };
   },
 
   endDrag(props, monitor, component) {
-    props.onQualityProfileItemDragEnd(monitor.getItem(), monitor.didDrop());
+    props.onQualityProfileItemDragEnd(monitor.didDrop());
   }
 };
 
 const qualityProfileItemDropTarget = {
   hover(props, monitor, component) {
-    const dragIndex = monitor.getItem().sortIndex;
-    const hoverIndex = props.sortIndex;
-
-    const hoverBoundingRect = findDOMNode(component).getBoundingClientRect();
+    const {
+      qualityIndex: dragQualityIndex,
+      isGroup: isDragGroup
+    } = monitor.getItem();
+
+    const dropQualityIndex = props.qualityIndex;
+    const isDropGroupItem = !!(props.qualityId && props.groupId);
+
+    // Use childNodeIndex to select the correct node to get the middle of so
+    // we don't bounce between above and below causing rapid setState calls.
+    const childNodeIndex = component.props.isOverCurrent && component.props.isDraggingUp ? 1 :0;
+    const componentDOMNode = findDOMNode(component).children[childNodeIndex];
+    const hoverBoundingRect = componentDOMNode.getBoundingClientRect();
     const hoverMiddleY = (hoverBoundingRect.bottom - hoverBoundingRect.top) / 2;
     const clientOffset = monitor.getClientOffset();
     const hoverClientY = clientOffset.y - hoverBoundingRect.top;
 
-    // Moving up, only trigger if drag position is above 50%
-    if (dragIndex < hoverIndex && hoverClientY > hoverMiddleY) {
+    // If we're hovering over a child don't trigger on the parent
+    if (!monitor.isOver({ shallow: true })) {
+      return;
+    }
+
+    // Don't show targets for dropping on self
+    if (dragQualityIndex === dropQualityIndex) {
+      return;
+    }
+
+    // Don't allow a group to be dropped inside a group
+    if (isDragGroup && isDropGroupItem) {
       return;
     }
 
-    // Moving down, only trigger if drag position is below 50%
-    if (dragIndex > hoverIndex && hoverClientY < hoverMiddleY) {
+    let dropPosition = null;
+
+    // Determine drop position based on position over target
+    if (hoverClientY > hoverMiddleY) {
+      dropPosition = 'below';
+    } else if (hoverClientY < hoverMiddleY) {
+      dropPosition = 'above';
+    } else {
       return;
     }
 
-    props.onQualityProfileItemDragMove(dragIndex, hoverIndex);
+    props.onQualityProfileItemDragMove({
+      dragQualityIndex,
+      dropQualityIndex,
+      dropPosition
+    });
   }
 };
 
@@ -56,7 +98,8 @@ function collectDragSource(connect, monitor) {
 function collectDropTarget(connect, monitor) {
   return {
     connectDropTarget: connect.dropTarget(),
-    isOver: monitor.isOver()
+    isOver: monitor.isOver(),
+    isOverCurrent: monitor.isOver({ shallow: true })
   };
 }
 
@@ -67,25 +110,30 @@ class QualityProfileItemDragSource extends Component {
 
   render() {
     const {
+      editGroups,
+      groupId,
       qualityId,
       name,
       allowed,
-      sortIndex,
+      items,
+      qualityIndex,
       isDragging,
       isDraggingUp,
       isDraggingDown,
-      isOver,
+      isOverCurrent,
       connectDragSource,
       connectDropTarget,
-      onQualityProfileItemAllowedChange
+      onCreateGroupPress,
+      onDeleteGroupPress,
+      onQualityProfileItemAllowedChange,
+      onItemGroupAllowedChange,
+      onItemGroupNameChange,
+      onQualityProfileItemDragMove,
+      onQualityProfileItemDragEnd
     } = this.props;
 
-    const isBefore = !isDragging && isDraggingUp && isOver;
-    const isAfter = !isDragging && isDraggingDown && isOver;
-
-    // if (isDragging && !isOver) {
-    //   return null;
-    // }
+    const isBefore = !isDragging && isDraggingUp && isOverCurrent;
+    const isAfter = !isDragging && isDraggingDown && isOverCurrent;
 
     return connectDropTarget(
       <div
@@ -105,16 +153,44 @@ class QualityProfileItemDragSource extends Component {
             />
         }
 
-        <QualityProfileItem
-          qualityId={qualityId}
-          name={name}
-          allowed={allowed}
-          sortIndex={sortIndex}
-          isDragging={isDragging}
-          isOver={isOver}
-          connectDragSource={connectDragSource}
-          onQualityProfileItemAllowedChange={onQualityProfileItemAllowedChange}
-        />
+        {
+          !!groupId && qualityId == null &&
+            <QualityProfileItemGroup
+              editGroups={editGroups}
+              groupId={groupId}
+              name={name}
+              allowed={allowed}
+              items={items}
+              qualityIndex={qualityIndex}
+              isDragging={isDragging}
+              isDraggingUp={isDraggingUp}
+              isDraggingDown={isDraggingDown}
+              connectDragSource={connectDragSource}
+              onDeleteGroupPress={onDeleteGroupPress}
+              onQualityProfileItemAllowedChange={onQualityProfileItemAllowedChange}
+              onItemGroupAllowedChange={onItemGroupAllowedChange}
+              onItemGroupNameChange={onItemGroupNameChange}
+              onQualityProfileItemDragMove={onQualityProfileItemDragMove}
+              onQualityProfileItemDragEnd={onQualityProfileItemDragEnd}
+            />
+        }
+
+        {
+          qualityId != null &&
+            <QualityProfileItem
+              editGroups={editGroups}
+              groupId={groupId}
+              qualityId={qualityId}
+              name={name}
+              allowed={allowed}
+              qualityIndex={qualityIndex}
+              isDragging={isDragging}
+              isOverCurrent={isOverCurrent}
+              connectDragSource={connectDragSource}
+              onCreateGroupPress={onCreateGroupPress}
+              onQualityProfileItemAllowedChange={onQualityProfileItemAllowedChange}
+            />
+        }
 
         {
           isAfter &&
@@ -131,17 +207,25 @@ class QualityProfileItemDragSource extends Component {
 }
 
 QualityProfileItemDragSource.propTypes = {
-  qualityId: PropTypes.number.isRequired,
+  editGroups: PropTypes.bool.isRequired,
+  groupId: PropTypes.number,
+  qualityId: PropTypes.number,
   name: PropTypes.string.isRequired,
   allowed: PropTypes.bool.isRequired,
-  sortIndex: PropTypes.number.isRequired,
+  items: PropTypes.arrayOf(PropTypes.object),
+  qualityIndex: PropTypes.string.isRequired,
   isDragging: PropTypes.bool,
   isDraggingUp: PropTypes.bool,
   isDraggingDown: PropTypes.bool,
-  isOver: PropTypes.bool,
+  isOverCurrent: PropTypes.bool,
+  isInGroup: PropTypes.bool,
   connectDragSource: PropTypes.func,
   connectDropTarget: PropTypes.func,
+  onCreateGroupPress: PropTypes.func,
+  onDeleteGroupPress: PropTypes.func,
   onQualityProfileItemAllowedChange: PropTypes.func.isRequired,
+  onItemGroupAllowedChange: PropTypes.func,
+  onItemGroupNameChange: PropTypes.func,
   onQualityProfileItemDragMove: PropTypes.func.isRequired,
   onQualityProfileItemDragEnd: PropTypes.func.isRequired
 };
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.css b/frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.css
new file mode 100644
index 000000000..dc4d40e53
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.css
@@ -0,0 +1,105 @@
+.qualityProfileItemGroup {
+  width: 100%;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  background: #fafafa;
+
+  &.editGroups {
+    background: #fcfcfc;
+  }
+}
+
+.qualityProfileItemGroupInfo {
+  display: flex;
+  align-items: stretch;
+  width: 100%;
+}
+
+.checkInputContainer {
+  composes: checkInputContainer from './QualityProfileItem.css';
+
+  display: flex;
+  align-items: center;
+}
+
+.checkInput {
+  composes: checkInput from './QualityProfileItem.css';
+}
+
+.nameInput {
+  composes: text from 'Components/Form/TextInput.css';
+
+  margin-top: 4px;
+  margin-right: 10px;
+}
+
+.nameContainer {
+  display: flex;
+  align-items: center;
+  flex-grow: 1;
+}
+
+.name {
+  flex-shrink: 0;
+
+  &.notAllowed {
+    color: #c6c6c6;
+  }
+}
+
+.groupQualities {
+  display: flex;
+  justify-content: flex-end;
+  flex-grow: 1;
+  flex-wrap: wrap;
+  margin: 2px 0 2px 10px;
+}
+
+.qualityNameContainer {
+  display: flex;
+  align-items: stretch;
+  flex-grow: 1;
+  margin-bottom: 0;
+  margin-left: 2px;
+  font-weight: normal;
+}
+
+.qualityNameLabel {
+  composes: qualityNameContainer;
+
+  cursor: pointer;
+}
+
+.deleteGroupButton {
+  composes: buton from 'Components/Link/IconButton.css';
+
+  display: flex;
+  justify-content: center;
+  flex-shrink: 0;
+  margin-right: 5px;
+  margin-left: 8px;
+  width: 20px;
+}
+
+.dragHandle {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+  margin-left: auto;
+  width: $dragHandleWidth;
+  text-align: center;
+  cursor: grab;
+}
+
+.dragIcon {
+  top: 0;
+}
+
+.isDragging {
+  opacity: 0.25;
+}
+
+.items {
+  margin: 0 50px 0 35px;
+}
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.js b/frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.js
new file mode 100644
index 000000000..34008b1ec
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.js
@@ -0,0 +1,200 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import classNames from 'classnames';
+import { icons } from 'Helpers/Props';
+import Icon from 'Components/Icon';
+import Label from 'Components/Label';
+import IconButton from 'Components/Link/IconButton';
+import CheckInput from 'Components/Form/CheckInput';
+import TextInput from 'Components/Form/TextInput';
+import QualityProfileItemDragSource from './QualityProfileItemDragSource';
+import styles from './QualityProfileItemGroup.css';
+
+class QualityProfileItemGroup extends Component {
+
+  //
+  // Listeners
+
+  onAllowedChange = ({ value }) => {
+    const {
+      groupId,
+      onItemGroupAllowedChange
+    } = this.props;
+
+    onItemGroupAllowedChange(groupId, value);
+  }
+
+  onNameChange = ({ value }) => {
+    const {
+      groupId,
+      onItemGroupNameChange
+    } = this.props;
+
+    onItemGroupNameChange(groupId, value);
+  }
+
+  onDeleteGroupPress = ({ value }) => {
+    const {
+      groupId,
+      onDeleteGroupPress
+    } = this.props;
+
+    onDeleteGroupPress(groupId, value);
+  }
+
+  //
+  // Render
+
+  render() {
+    const {
+      editGroups,
+      groupId,
+      name,
+      allowed,
+      items,
+      qualityIndex,
+      isDragging,
+      isDraggingUp,
+      isDraggingDown,
+      connectDragSource,
+      onQualityProfileItemAllowedChange,
+      onQualityProfileItemDragMove,
+      onQualityProfileItemDragEnd
+    } = this.props;
+
+    return (
+      <div
+        className={classNames(
+          styles.qualityProfileItemGroup,
+          editGroups && styles.editGroups,
+          isDragging && styles.isDragging,
+        )}
+      >
+        <div className={styles.qualityProfileItemGroupInfo}>
+          {
+            editGroups &&
+              <div className={styles.qualityNameContainer}>
+                <IconButton
+                  className={styles.deleteGroupButton}
+                  name={icons.UNGROUP}
+                  title="Ungroup"
+                  onPress={this.onDeleteGroupPress}
+                />
+
+                <TextInput
+                  className={styles.nameInput}
+                  name="name"
+                  value={name}
+                  onChange={this.onNameChange}
+                />
+              </div>
+          }
+
+          {
+            !editGroups &&
+              <label
+                className={styles.qualityNameLabel}
+              >
+                <CheckInput
+                  className={styles.checkInput}
+                  containerClassName={styles.checkInputContainer}
+                  name="allowed"
+                  value={allowed}
+                  onChange={this.onAllowedChange}
+                />
+
+                <div className={styles.nameContainer}>
+                  <div className={classNames(
+                    styles.name,
+                    !allowed && styles.notAllowed
+                  )}
+                  >
+                    {name}
+                  </div>
+
+                  <div className={styles.groupQualities}>
+                    {
+                      items.map(({ quality }) => {
+                        return (
+                          <Label key={quality.id}>
+                            {quality.name}
+                          </Label>
+                        );
+                      }).reverse()
+                    }
+                  </div>
+                </div>
+              </label>
+          }
+
+          {
+            connectDragSource(
+              <div className={styles.dragHandle}>
+                <Icon
+                  className={styles.dragIcon}
+                  name={icons.REORDER}
+                  title="Reorder"
+                />
+              </div>
+            )
+          }
+        </div>
+
+        {
+          editGroups &&
+            <div className={styles.items}>
+              {
+                items.map(({ quality }, index) => {
+                  return (
+                    <QualityProfileItemDragSource
+                      key={quality.id}
+                      editGroups={editGroups}
+                      groupId={groupId}
+                      qualityId={quality.id}
+                      name={quality.name}
+                      allowed={allowed}
+                      items={items}
+                      qualityIndex={`${qualityIndex}.${index + 1}`}
+                      isDragging={isDragging}
+                      isDraggingUp={isDraggingUp}
+                      isDraggingDown={isDraggingDown}
+                      isInGroup={true}
+                      onQualityProfileItemAllowedChange={onQualityProfileItemAllowedChange}
+                      onQualityProfileItemDragMove={onQualityProfileItemDragMove}
+                      onQualityProfileItemDragEnd={onQualityProfileItemDragEnd}
+                    />
+                  );
+                }).reverse()
+              }
+            </div>
+        }
+      </div>
+    );
+  }
+}
+
+QualityProfileItemGroup.propTypes = {
+  editGroups: PropTypes.bool,
+  groupId: PropTypes.number.isRequired,
+  name: PropTypes.string.isRequired,
+  allowed: PropTypes.bool.isRequired,
+  items: PropTypes.arrayOf(PropTypes.object).isRequired,
+  qualityIndex: PropTypes.string.isRequired,
+  isDragging: PropTypes.bool.isRequired,
+  isDraggingUp: PropTypes.bool.isRequired,
+  isDraggingDown: PropTypes.bool.isRequired,
+  connectDragSource: PropTypes.func,
+  onItemGroupAllowedChange: PropTypes.func.isRequired,
+  onQualityProfileItemAllowedChange: PropTypes.func.isRequired,
+  onItemGroupNameChange: PropTypes.func.isRequired,
+  onDeleteGroupPress: PropTypes.func.isRequired,
+  onQualityProfileItemDragMove: PropTypes.func.isRequired,
+  onQualityProfileItemDragEnd: PropTypes.func.isRequired
+};
+
+QualityProfileItemGroup.defaultProps = {
+  // The drag preview will not connect the drag handle.
+  connectDragSource: (node) => node
+};
+
+export default QualityProfileItemGroup;
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileItems.css b/frontend/src/Settings/Profiles/Quality/QualityProfileItems.css
index 344df5b08..6b4268de9 100644
--- a/frontend/src/Settings/Profiles/Quality/QualityProfileItems.css
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfileItems.css
@@ -1,6 +1,15 @@
+.editGroupsButton {
+  composes: button from 'Components/Link/Button.css';
+
+  margin-top: 10px;
+}
+
+.editGroupsButtonIcon {
+  margin-right: 8px;
+}
+
 .qualities {
   margin-top: 10px;
-  /* TODO: This should consider the number of qualities in the list */
-  min-height: 550px;
+  transition: min-height 200ms;
   user-select: none;
 }
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileItems.js b/frontend/src/Settings/Profiles/Quality/QualityProfileItems.js
index 5a58da630..e2bf1e3f9 100644
--- a/frontend/src/Settings/Profiles/Quality/QualityProfileItems.js
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfileItems.js
@@ -1,5 +1,9 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Measure from 'react-measure';
+import { icons, kinds, sizes } from 'Helpers/Props';
+import Icon from 'Components/Icon';
+import Button from 'Components/Link/Button';
 import FormGroup from 'Components/Form/FormGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import FormInputHelpText from 'Components/Form/FormInputHelpText';
@@ -9,26 +13,69 @@ import styles from './QualityProfileItems.css';
 
 class QualityProfileItems extends Component {
 
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      qualitiesHeight: 0,
+      qualitiesHeightEditGroups: 0
+    };
+  }
+
+  componentDidMount() {
+    this.props.onToggleEditGroupsMode();
+  }
+
+  //
+  // Listeners
+
+  onMeasure = ({ height }) => {
+    if (this.props.editGroups) {
+      this.setState({
+        qualitiesHeightEditGroups: height
+      });
+    } else {
+      this.setState({ qualitiesHeight: height });
+    }
+  }
+
+  onToggleEditGroupsMode = () => {
+    this.props.onToggleEditGroupsMode();
+  }
+
   //
   // Render
 
   render() {
     const {
-      dragIndex,
-      dropIndex,
+      editGroups,
+      dropQualityIndex,
+      dropPosition,
       qualityProfileItems,
       errors,
       warnings,
       ...otherProps
     } = this.props;
 
-    const isDragging = dropIndex !== null;
-    const isDraggingUp = isDragging && dropIndex > dragIndex;
-    const isDraggingDown = isDragging && dropIndex < dragIndex;
+    const {
+      qualitiesHeight,
+      qualitiesHeightEditGroups
+    } = this.state;
+
+    const isDragging = dropQualityIndex !== null;
+    const isDraggingUp = isDragging && dropPosition === 'above';
+    const isDraggingDown = isDragging && dropPosition === 'below';
+    const minHeight = editGroups ? qualitiesHeightEditGroups : qualitiesHeight;
 
     return (
-      <FormGroup>
-        <FormLabel>Qualities</FormLabel>
+      <FormGroup size={sizes.EXTRA_SMALL}>
+        <FormLabel size={sizes.SMALL}>
+          Qualities
+        </FormLabel>
+
         <div>
           <FormInputHelpText
             text="Qualities higher in the list are more preferred. Only checked qualities are wanted"
@@ -60,27 +107,59 @@ class QualityProfileItems extends Component {
             })
           }
 
-          <div className={styles.qualities}>
-            {
-              qualityProfileItems.map(({ allowed, quality }, index) => {
-                return (
-                  <QualityProfileItemDragSource
-                    key={quality.id}
-                    qualityId={quality.id}
-                    name={quality.name}
-                    allowed={allowed}
-                    sortIndex={index}
-                    isDragging={isDragging}
-                    isDraggingUp={isDraggingUp}
-                    isDraggingDown={isDraggingDown}
-                    {...otherProps}
-                  />
-                );
-              }).reverse()
-            }
-
-            <QualityProfileItemDragPreview />
-          </div>
+          <Button
+            className={styles.editGroupsButton}
+            kind={kinds.PRIMARY}
+            onPress={this.onToggleEditGroupsMode}
+          >
+            <div>
+              <Icon
+                className={styles.editGroupsButtonIcon}
+                name={editGroups ? icons.REORDER : icons.GROUP}
+              />
+
+              {
+                editGroups ? 'Done Editing Groups' : 'Edit Groups'
+              }
+            </div>
+          </Button>
+
+          <Measure
+            whitelist={['height']}
+            includeMargin={false}
+            onMeasure={this.onMeasure}
+          >
+            <div
+              className={styles.qualities}
+              style={{ minHeight: `${minHeight}px` }}
+            >
+              {
+                qualityProfileItems.map(({ id, name, allowed, quality, items }, index) => {
+                  const identifier = quality ? quality.id : id;
+
+                  return (
+                    <QualityProfileItemDragSource
+                      key={identifier}
+                      editGroups={editGroups}
+                      groupId={id}
+                      qualityId={quality && quality.id}
+                      name={quality ? quality.name : name}
+                      allowed={allowed}
+                      items={items}
+                      qualityIndex={`${index + 1}`}
+                      isInGroup={false}
+                      isDragging={isDragging}
+                      isDraggingUp={isDraggingUp}
+                      isDraggingDown={isDraggingDown}
+                      {...otherProps}
+                    />
+                  );
+                }).reverse()
+              }
+
+              <QualityProfileItemDragPreview />
+            </div>
+          </Measure>
         </div>
       </FormGroup>
     );
@@ -88,11 +167,14 @@ class QualityProfileItems extends Component {
 }
 
 QualityProfileItems.propTypes = {
-  dragIndex: PropTypes.number,
-  dropIndex: PropTypes.number,
+  editGroups: PropTypes.bool.isRequired,
+  dragQualityIndex: PropTypes.string,
+  dropQualityIndex: PropTypes.string,
+  dropPosition: PropTypes.string,
   qualityProfileItems: PropTypes.arrayOf(PropTypes.object).isRequired,
   errors: PropTypes.arrayOf(PropTypes.object),
-  warnings: PropTypes.arrayOf(PropTypes.object)
+  warnings: PropTypes.arrayOf(PropTypes.object),
+  onToggleEditGroupsMode: PropTypes.func.isRequired
 };
 
 QualityProfileItems.defaultProps = {
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfiles.js b/frontend/src/Settings/Profiles/Quality/QualityProfiles.js
index 75f049695..679cc9ed4 100644
--- a/frontend/src/Settings/Profiles/Quality/QualityProfiles.js
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfiles.js
@@ -91,7 +91,6 @@ class QualityProfiles extends Component {
 }
 
 QualityProfiles.propTypes = {
-  advancedSettings: PropTypes.bool.isRequired,
   isFetching: PropTypes.bool.isRequired,
   error: PropTypes.object,
   isDeleting: PropTypes.bool.isRequired,
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfilesConnector.js b/frontend/src/Settings/Profiles/Quality/QualityProfilesConnector.js
index 4bb1529ee..bb7fdfd71 100644
--- a/frontend/src/Settings/Profiles/Quality/QualityProfilesConnector.js
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfilesConnector.js
@@ -7,11 +7,9 @@ import QualityProfiles from './QualityProfiles';
 
 function createMapStateToProps() {
   return createSelector(
-    (state) => state.settings.advancedSettings,
     (state) => state.settings.qualityProfiles,
-    (advancedSettings, qualityProfiles) => {
+    (qualityProfiles) => {
       return {
-        advancedSettings,
         ...qualityProfiles
       };
     }
diff --git a/frontend/src/Store/Actions/Creators/createFetchHandler.js b/frontend/src/Store/Actions/Creators/createFetchHandler.js
index 5bf31b92e..e0f572dbc 100644
--- a/frontend/src/Store/Actions/Creators/createFetchHandler.js
+++ b/frontend/src/Store/Actions/Creators/createFetchHandler.js
@@ -1,5 +1,5 @@
-import $ from 'jquery';
 import { batchActions } from 'redux-batched-actions';
+import createAjaxRequest from 'Utilities/createAjaxRequest';
 import { set, update, updateItem } from '../baseActions';
 
 function createFetchHandler(section, url) {
@@ -12,13 +12,13 @@ function createFetchHandler(section, url) {
         ...otherPayload
       } = payload;
 
-      const promise = $.ajax({
+      const { request, abortRequest } = createAjaxRequest({
         url: id == null ? url : `${url}/${id}`,
         data: otherPayload,
         traditional: true
       });
 
-      promise.done((data) => {
+      request.done((data) => {
         dispatch(batchActions([
           id == null ? update({ section, data }) : updateItem({ section, ...data }),
 
@@ -31,14 +31,16 @@ function createFetchHandler(section, url) {
         ]));
       });
 
-      promise.fail((xhr) => {
+      request.fail((xhr) => {
         dispatch(set({
           section,
           isFetching: false,
           isPopulated: false,
-          error: xhr
+          error: xhr.aborted ? null : xhr
         }));
       });
+
+      return abortRequest;
     };
   };
 }
diff --git a/frontend/src/Store/Actions/Creators/createSaveProviderHandler.js b/frontend/src/Store/Actions/Creators/createSaveProviderHandler.js
index 6b6d89314..7d9f88ee0 100644
--- a/frontend/src/Store/Actions/Creators/createSaveProviderHandler.js
+++ b/frontend/src/Store/Actions/Creators/createSaveProviderHandler.js
@@ -37,8 +37,8 @@ function createSaveProviderHandler(section, url, getFromState) {
         ajaxOptions.method = 'PUT';
       }
 
-      const { request, abortRequest } = createAjaxRequest()(ajaxOptions);
-
+      const { request, abortRequest } = createAjaxRequest(ajaxOptions);
+      
       abortCurrentRequests[section] = abortRequest;
 
       request.done((data) => {
diff --git a/frontend/src/Store/Actions/Creators/createTestProviderHandler.js b/frontend/src/Store/Actions/Creators/createTestProviderHandler.js
index f3cf354bc..352eec001 100644
--- a/frontend/src/Store/Actions/Creators/createTestProviderHandler.js
+++ b/frontend/src/Store/Actions/Creators/createTestProviderHandler.js
@@ -30,8 +30,8 @@ function createTestProviderHandler(section, url, getFromState) {
         data: JSON.stringify(testData)
       };
 
-      const { request, abortRequest } = createAjaxRequest()(ajaxOptions);
-
+      const { request, abortRequest } = createAjaxRequest(ajaxOptions);
+      
       abortCurrentRequests[section] = abortRequest;
 
       request.done((data) => {
diff --git a/frontend/src/Store/Actions/actionTypes.js b/frontend/src/Store/Actions/actionTypes.js
index 2c7a4dc50..fd615fd7e 100644
--- a/frontend/src/Store/Actions/actionTypes.js
+++ b/frontend/src/Store/Actions/actionTypes.js
@@ -113,6 +113,7 @@ export const ALBUM_HISTORY_MARK_AS_FAILED = 'ALBUM_HISTORY_MARK_AS_FAILED';
 // Releases
 
 export const FETCH_RELEASES = 'FETCH_RELEASES';
+export const CANCEL_FETCH_RELEASES = 'CANCEL_FETCH_RELEASES';
 export const SET_RELEASES_SORT = 'SET_RELEASES_SORT';
 export const CLEAR_RELEASES = 'CLEAR_RELEASES';
 export const GRAB_RELEASE = 'GRAB_RELEASE';
diff --git a/frontend/src/Store/Actions/addArtistActionHandlers.js b/frontend/src/Store/Actions/addArtistActionHandlers.js
index 09ca0f9bf..0d811990b 100644
--- a/frontend/src/Store/Actions/addArtistActionHandlers.js
+++ b/frontend/src/Store/Actions/addArtistActionHandlers.js
@@ -18,7 +18,7 @@ const addArtistActionHandlers = {
         abortCurrentRequest();
       }
 
-      const { request, abortRequest } = createAjaxRequest()({
+      const { request, abortRequest } = createAjaxRequest({
         url: '/artist/lookup',
         data: {
           term: payload.term
diff --git a/frontend/src/Store/Actions/releaseActionHandlers.js b/frontend/src/Store/Actions/releaseActionHandlers.js
index 15ebaa2b0..6fc0520f5 100644
--- a/frontend/src/Store/Actions/releaseActionHandlers.js
+++ b/frontend/src/Store/Actions/releaseActionHandlers.js
@@ -3,10 +3,27 @@ import createFetchHandler from './Creators/createFetchHandler';
 import * as types from './actionTypes';
 import { updateRelease } from './releaseActions';
 
+let abortCurrentRequest = null;
 const section = 'releases';
 
+const fetchReleases = createFetchHandler(section, '/release');
+
 const releaseActionHandlers = {
-  [types.FETCH_RELEASES]: createFetchHandler(section, '/release'),
+  [types.FETCH_RELEASES]: function(payload) {
+    return function(dispatch, getState) {
+      const abortRequest = fetchReleases(payload)(dispatch, getState);
+
+      abortCurrentRequest = abortRequest;
+    };
+  },
+
+  [types.CANCEL_FETCH_RELEASES]: function(payload) {
+    return function(dispatch, getState) {
+      if (abortCurrentRequest) {
+        abortCurrentRequest = abortCurrentRequest();
+      }
+    };
+  },
 
   [types.GRAB_RELEASE]: function(payload) {
     return function(dispatch, getState) {
diff --git a/frontend/src/Store/Actions/releaseActions.js b/frontend/src/Store/Actions/releaseActions.js
index 580ffe804..065ff1253 100644
--- a/frontend/src/Store/Actions/releaseActions.js
+++ b/frontend/src/Store/Actions/releaseActions.js
@@ -3,6 +3,7 @@ import * as types from './actionTypes';
 import releaseActionHandlers from './releaseActionHandlers';
 
 export const fetchReleases = releaseActionHandlers[types.FETCH_RELEASES];
+export const cancelFetchReleases = releaseActionHandlers[types.CANCEL_FETCH_RELEASES];
 export const setReleasesSort = createAction(types.SET_RELEASES_SORT);
 export const clearReleases = createAction(types.CLEAR_RELEASES);
 export const grabRelease = releaseActionHandlers[types.GRAB_RELEASE];
diff --git a/frontend/src/Store/Reducers/episodeReducers.js b/frontend/src/Store/Reducers/episodeReducers.js
index 479ea3fe0..dcd572368 100644
--- a/frontend/src/Store/Reducers/episodeReducers.js
+++ b/frontend/src/Store/Reducers/episodeReducers.js
@@ -37,6 +37,11 @@ export const defaultState = {
       label: 'Release Date',
       isVisible: true
     },
+    {
+      name: 'mediumCount',
+      label: 'Media Count',
+      isVisible: false
+    },
     {
       name: 'trackCount',
       label: 'Track Count',
diff --git a/frontend/src/Store/Reducers/trackReducers.js b/frontend/src/Store/Reducers/trackReducers.js
index 3f684fd9d..0a7558691 100644
--- a/frontend/src/Store/Reducers/trackReducers.js
+++ b/frontend/src/Store/Reducers/trackReducers.js
@@ -11,14 +11,19 @@ export const defaultState = {
   isFetching: false,
   isPopulated: false,
   error: null,
-  sortKey: 'trackNumber',
+  sortKey: 'mediumNumber',
   sortDirection: sortDirections.DESCENDING,
   items: [],
 
   columns: [
     {
-      name: 'trackNumber',
-      label: '#',
+      name: 'medium',
+      label: 'Medium',
+      isVisible: true
+    },
+    {
+      name: 'absoluteTrackNumber',
+      label: 'Track',
       isVisible: true
     },
     {
diff --git a/frontend/src/Styles/Variables/dimensions.js b/frontend/src/Styles/Variables/dimensions.js
index 54282902c..927f04895 100644
--- a/frontend/src/Styles/Variables/dimensions.js
+++ b/frontend/src/Styles/Variables/dimensions.js
@@ -19,16 +19,21 @@ module.exports = {
   breakpointSmall: '768px',
   breakpointMedium: '992px',
   breakpointLarge: '1200px',
+  breakpointExtraLarge: '1450px',
 
   // Form
+  formGroupExtraSmallWidth: '550px',
   formGroupSmallWidth: '650px',
   formGroupMediumWidth: '800px',
   formGroupLargeWidth: '1200px',
-  formLabelWidth: '250px',
+  formLabelSmallWidth: '150px',
+  formLabelLargeWidth: '250px',
   formLabelRightMarginWidth: '20px',
 
   // Drag
   dragHandleWidth: '40px',
+  qualityProfileItemHeight: '30px',
+  qualityProfileItemDragSourcePadding: '4px',
 
   // Progress Bar
   progressBarSmallHeight: '5px',
@@ -38,6 +43,9 @@ module.exports = {
   // Jump Bar
   jumpBarItemHeight: '25px',
 
+  // Modal
+  modalBodyPadding: '30px',
+
   // Artist
   artistIndexColumnPadding: '20px',
   artistIndexColumnPaddingSmallScreen: '10px',
diff --git a/frontend/src/TrackFile/Editor/TrackFileEditorModalContentConnector.js b/frontend/src/TrackFile/Editor/TrackFileEditorModalContentConnector.js
index 1fd99480c..e60ac423f 100644
--- a/frontend/src/TrackFile/Editor/TrackFileEditorModalContentConnector.js
+++ b/frontend/src/TrackFile/Editor/TrackFileEditorModalContentConnector.js
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
+import getQualities from 'Utilities/Quality/getQualities';
 import createArtistSelector from 'Store/Selectors/createArtistSelector';
 import { deleteTrackFiles, updateTrackFiles } from 'Store/Actions/trackFileActions';
 import { fetchTracks, clearTracks } from 'Store/Actions/trackActions';
@@ -52,8 +53,8 @@ function createMapStateToProps() {
       });
 
       const languages = _.map(languageProfilesSchema.languages, 'language');
-      const qualities = _.map(qualityProfileSchema.items, 'quality');
-
+      const qualities = getQualities(qualityProfileSchema.items);
+      
       return {
         items,
         artistType: artist.artistType,
@@ -90,18 +91,6 @@ function createMapDispatchToProps(dispatch, props) {
 
     onDeletePress(trackFileIds) {
       dispatch(deleteTrackFiles({ trackFileIds }));
-    },
-
-    onQualityChange(trackFileIds, qualityId) {
-      const quality = {
-        quality: _.find(this.props.qualities, { id: qualityId }),
-        revision: {
-          version: 1,
-          real: 0
-        }
-      };
-
-      dispatch(updateTrackFiles({ trackFileIds, quality }));
     }
   };
 }
diff --git a/frontend/src/TrackFile/Editor/TrackFileEditorRow.js b/frontend/src/TrackFile/Editor/TrackFileEditorRow.js
index 2e1d3f2cd..4683735ee 100644
--- a/frontend/src/TrackFile/Editor/TrackFileEditorRow.js
+++ b/frontend/src/TrackFile/Editor/TrackFileEditorRow.js
@@ -53,7 +53,7 @@ function TrackFileEditorRow(props) {
 
 TrackFileEditorRow.propTypes = {
   id: PropTypes.number.isRequired,
-  trackNumber: PropTypes.number.isRequired,
+  trackNumber: PropTypes.string.isRequired,
   relativePath: PropTypes.string.isRequired,
   language: PropTypes.object.isRequired,
   quality: PropTypes.object.isRequired,
diff --git a/frontend/src/Utilities/Quality/getQualities.js b/frontend/src/Utilities/Quality/getQualities.js
new file mode 100644
index 000000000..da09851ea
--- /dev/null
+++ b/frontend/src/Utilities/Quality/getQualities.js
@@ -0,0 +1,16 @@
+export default function getQualities(qualities) {
+  if (!qualities) {
+    return [];
+  }
+
+  return qualities.reduce((acc, item) => {
+    if (item.quality) {
+      acc.push(item.quality);
+    } else {
+      const groupQualities = item.items.map((i) => i.quality);
+      acc.push(...groupQualities);
+    }
+
+    return acc;
+  }, []);
+}
diff --git a/frontend/src/Utilities/createAjaxRequest.js b/frontend/src/Utilities/createAjaxRequest.js
index fc75d65b8..7ad8961da 100644
--- a/frontend/src/Utilities/createAjaxRequest.js
+++ b/frontend/src/Utilities/createAjaxRequest.js
@@ -1,32 +1,30 @@
 import $ from 'jquery';
 
-export default function createAjaxRequest() {
-  return function(ajaxOptions) {
-    const requestXHR = new window.XMLHttpRequest();
-    let aborted = false;
-    let complete = false;
+export default function createAjaxRequest(ajaxOptions) {
+  const requestXHR = new window.XMLHttpRequest();
+  let aborted = false;
+  let complete = false;
 
-    function abortRequest() {
-      if (!complete) {
-        aborted = true;
-        requestXHR.abort();
-      }
+  function abortRequest() {
+    if (!complete) {
+      aborted = true;
+      requestXHR.abort();
     }
+  }
 
-    const request = $.ajax({
-      xhr: () => requestXHR,
-      ...ajaxOptions
-    }).then(null, (xhr, textStatus, errorThrown) => {
-      xhr.aborted = aborted;
+  const request = $.ajax({
+    xhr: () => requestXHR,
+    ...ajaxOptions
+  }).then(null, (xhr, textStatus, errorThrown) => {
+    xhr.aborted = aborted;
 
-      return $.Deferred().reject(xhr, textStatus, errorThrown).promise();
-    }).always(() => {
-      complete = true;
-    });
+    return $.Deferred().reject(xhr, textStatus, errorThrown).promise();
+  }).always(() => {
+    complete = true;
+  });
 
-    return {
-      request,
-      abortRequest
-    };
+  return {
+    request,
+    abortRequest
   };
 }
diff --git a/package.json b/package.json
index e682076ef..7b6c90d0f 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,6 @@
     "react-tag-autocomplete": "5.4.1",
     "react-tether": "0.5.7",
     "react-text-truncate": "0.12.0",
-    "react-truncate": "2.2.2",
     "react-virtualized": "9.10.1",
     "redux": "3.7.2",
     "redux-actions": "2.2.1",
diff --git a/src/Lidarr.Api.V1/Albums/AlbumResource.cs b/src/Lidarr.Api.V1/Albums/AlbumResource.cs
index b4df959d4..a7043a37f 100644
--- a/src/Lidarr.Api.V1/Albums/AlbumResource.cs
+++ b/src/Lidarr.Api.V1/Albums/AlbumResource.cs
@@ -20,9 +20,22 @@ namespace Lidarr.Api.V1.Albums
         public int ProfileId { get; set; }
         public int Duration { get; set; }
         public string AlbumType { get; set; }
+        public int MediumCount
+        {
+            get
+            {
+                if (Media == null)
+                {
+                    return 0;
+                }
+
+                return Media.Where(s => s.MediumNumber > 0).Count();
+            }
+        }
         public Ratings Ratings { get; set; }
         public DateTime? ReleaseDate { get; set; }
         public List<string> Genres { get; set; }
+        public List<MediumResource> Media { get; set; }
         public ArtistResource Artist { get; set; }
         public List<MediaCover> Images { get; set; }
         public AlbumStatisticsResource Statistics { get; set; }
@@ -32,7 +45,7 @@ namespace Lidarr.Api.V1.Albums
         public bool Grabbed { get; set; }
     }
 
-    public static class EpisodeResourceMapper
+    public static class AlbumResourceMapper
     {
         public static AlbumResource ToResource(this Album model)
         {
@@ -53,7 +66,8 @@ namespace Lidarr.Api.V1.Albums
                 Images = model.Images,
                 Ratings = model.Ratings,
                 Duration = model.Duration,
-                AlbumType = model.AlbumType
+                AlbumType = model.AlbumType,
+                Media = model.Media.ToResource(),
             };
         }
 
diff --git a/src/Lidarr.Api.V1/Albums/MediumResource.cs b/src/Lidarr.Api.V1/Albums/MediumResource.cs
new file mode 100644
index 000000000..7627469d6
--- /dev/null
+++ b/src/Lidarr.Api.V1/Albums/MediumResource.cs
@@ -0,0 +1,56 @@
+using System.Collections.Generic;
+using System.Linq;
+using NzbDrone.Core.Music;
+
+namespace Lidarr.Api.V1.Albums
+{
+    public class MediumResource
+    {
+        public int MediumNumber { get; set; }
+        public string MediumName { get; set; }
+        public string MediumFormat { get; set; }
+    }
+
+    public static class SeasonResourceMapper
+    {
+        public static MediumResource ToResource(this Medium model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+
+            return new MediumResource
+            {
+                MediumNumber = model.Number,
+                MediumName = model.Name,
+                MediumFormat = model.Format
+            };
+        }
+
+        public static Medium ToModel(this MediumResource resource)
+        {
+            if (resource == null)
+            {
+                return null;
+            }
+
+            return new Medium
+            {
+                Number = resource.MediumNumber,
+                Name = resource.MediumName,
+                Format = resource.MediumFormat
+            };
+        }
+
+        public static List<MediumResource> ToResource(this IEnumerable<Medium> models)
+        {
+            return models.Select(ToResource).ToList();
+        }
+
+        public static List<Medium> ToModel(this IEnumerable<MediumResource> resources)
+        {
+            return resources.Select(ToModel).ToList();
+        }
+    }
+}
diff --git a/src/Lidarr.Api.V1/History/HistoryModule.cs b/src/Lidarr.Api.V1/History/HistoryModule.cs
index 0f9eb48bd..fa11e63c4 100644
--- a/src/Lidarr.Api.V1/History/HistoryModule.cs
+++ b/src/Lidarr.Api.V1/History/HistoryModule.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using Nancy;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.DecisionEngine;
@@ -9,6 +11,7 @@ using Lidarr.Api.V1.Artist;
 using Lidarr.Api.V1.Tracks;
 using Lidarr.Http;
 using Lidarr.Http.Extensions;
+using Lidarr.Http.REST;
 
 namespace Lidarr.Api.V1.History
 {
@@ -27,6 +30,7 @@ namespace Lidarr.Api.V1.History
             _failedDownloadService = failedDownloadService;
             GetResourcePaged = GetHistory;
 
+            Get["/since"] = x => GetHistorySince();
             Post["/failed"] = x => MarkAsFailed();
         }
 
@@ -81,6 +85,30 @@ namespace Lidarr.Api.V1.History
             return ApplyToPage(_historyService.Paged, pagingSpec, h => MapToResource(h, includeArtist, includeAlbum, includeTrack));
         }
 
+        private List<HistoryResource> GetHistorySince()
+        {
+            var queryDate = Request.Query.Date;
+            var queryEventType = Request.Query.EventType;
+
+            if (!queryDate.HasValue)
+            {
+                throw new BadRequestException("date is missing");
+            }
+
+            DateTime date = DateTime.Parse(queryDate.Value);
+            HistoryEventType? eventType = null;
+            var includeArtist = Request.GetBooleanQueryParameter("includeArtist");
+            var includeAlbum = Request.GetBooleanQueryParameter("includeAlbum");
+            var includeTrack = Request.GetBooleanQueryParameter("includeTrack");
+
+            if (queryEventType.HasValue)
+            {
+                eventType = (HistoryEventType)Convert.ToInt32(queryEventType.Value);
+            }
+
+            return _historyService.Since(date, eventType).Select(h => MapToResource(h, includeArtist, includeAlbum, includeTrack)).ToList();
+        }
+
         private Response MarkAsFailed()
         {
             var id = (int)Request.Form.Id;
diff --git a/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj b/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj
index 24a87d3c3..9735d81d1 100644
--- a/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj
+++ b/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj
@@ -89,6 +89,7 @@
     <Compile Include="Albums\AlbumResource.cs" />
     <Compile Include="Albums\AlbumsMonitoredResource.cs" />
     <Compile Include="Albums\AlbumStatisticsResource.cs" />
+    <Compile Include="Albums\MediumResource.cs" />
     <Compile Include="Blacklist\BlacklistModule.cs" />
     <Compile Include="Blacklist\BlacklistResource.cs" />
     <Compile Include="Calendar\CalendarFeedModule.cs" />
@@ -97,6 +98,8 @@
     <Compile Include="Commands\CommandResource.cs" />
     <Compile Include="Config\MetadataProviderConfigModule.cs" />
     <Compile Include="Config\MetadataProviderConfigResource.cs" />
+    <Compile Include="Profiles\Quality\QualityCutoffValidator.cs" />
+    <Compile Include="Profiles\Quality\QualityItemsValidator.cs" />
     <Compile Include="TrackFiles\TrackFileListResource.cs" />
     <Compile Include="TrackFiles\MediaInfoResource.cs" />
     <Compile Include="Indexers\ReleaseModuleBase.cs" />
@@ -172,7 +175,6 @@
     <Compile Include="Profiles\Quality\QualityProfileModule.cs" />
     <Compile Include="Profiles\Quality\QualityProfileResource.cs" />
     <Compile Include="Profiles\Quality\QualityProfileSchemaModule.cs" />
-    <Compile Include="Profiles\Quality\QualityProfileValidation.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ProviderModuleBase.cs" />
     <Compile Include="ProviderResource.cs" />
diff --git a/src/Lidarr.Api.V1/Profiles/Quality/QualityCutoffValidator.cs b/src/Lidarr.Api.V1/Profiles/Quality/QualityCutoffValidator.cs
new file mode 100644
index 000000000..d8776f50b
--- /dev/null
+++ b/src/Lidarr.Api.V1/Profiles/Quality/QualityCutoffValidator.cs
@@ -0,0 +1,45 @@
+using System.Collections.Generic;
+using System.Linq;
+using FluentValidation;
+using FluentValidation.Validators;
+
+namespace Lidarr.Api.V1.Profiles.Quality
+{
+    public static class QualityCutoffValidator
+    {
+        public static IRuleBuilderOptions<T, int> ValidCutoff<T>(this IRuleBuilder<T, int> ruleBuilder)
+        {
+            return ruleBuilder.SetValidator(new ValidCutoffValidator<T>());
+        }
+    }
+
+    public class ValidCutoffValidator<T> : PropertyValidator
+    {
+        public ValidCutoffValidator()
+            : base("Cutoff must be an allowed quality or group")
+        {
+
+        }
+
+        protected override bool IsValid(PropertyValidatorContext context)
+        {
+            var cutoff = (int)context.PropertyValue;
+            dynamic instance = context.ParentContext.InstanceToValidate;
+            var items = instance.Items as IList<QualityProfileQualityItemResource>;
+
+            var cutoffItem = items.SingleOrDefault(i => i.Id == cutoff || (i.Quality != null && i.Quality.Id == cutoff));
+
+            if (cutoffItem == null)
+            {
+                return false;
+            }
+
+            if (!cutoffItem.Allowed)
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Lidarr.Api.V1/Profiles/Quality/QualityItemsValidator.cs b/src/Lidarr.Api.V1/Profiles/Quality/QualityItemsValidator.cs
new file mode 100644
index 000000000..411aea579
--- /dev/null
+++ b/src/Lidarr.Api.V1/Profiles/Quality/QualityItemsValidator.cs
@@ -0,0 +1,197 @@
+using System.Collections.Generic;
+using System.Linq;
+using FluentValidation;
+using FluentValidation.Validators;
+using NzbDrone.Common.Extensions;
+
+namespace Lidarr.Api.V1.Profiles.Quality
+{
+    public static class QualityItemsValidator
+    {
+        public static IRuleBuilderOptions<T, IList<QualityProfileQualityItemResource>> ValidItems<T>(this IRuleBuilder<T, IList<QualityProfileQualityItemResource>> ruleBuilder)
+        {
+            ruleBuilder.SetValidator(new NotEmptyValidator(null));
+            ruleBuilder.SetValidator(new AllowedValidator<T>());
+            ruleBuilder.SetValidator(new QualityNameValidator<T>());
+            ruleBuilder.SetValidator(new EmptyItemGroupNameValidator<T>());
+            ruleBuilder.SetValidator(new ItemGroupIdValidator<T>());
+            ruleBuilder.SetValidator(new UniqueIdValidator<T>());
+            ruleBuilder.SetValidator(new UniqueQualityIdValidator<T>());
+            return ruleBuilder.SetValidator(new ItemGroupNameValidator<T>());
+        }
+    }
+
+    public class AllowedValidator<T> : PropertyValidator
+    {
+        public AllowedValidator()
+            : base("Must contain at least one allowed quality")
+        {
+
+        }
+
+        protected override bool IsValid(PropertyValidatorContext context)
+        {
+            var list = context.PropertyValue as IList<QualityProfileQualityItemResource>;
+
+            if (list == null)
+            {
+                return false;
+            }
+
+            if (!list.Any(c => c.Allowed))
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+
+    public class EmptyItemGroupNameValidator<T> : PropertyValidator
+    {
+        public EmptyItemGroupNameValidator()
+            : base("Groups must not be empty")
+        {
+
+        }
+
+        protected override bool IsValid(PropertyValidatorContext context)
+        {
+            var items = context.PropertyValue as IList<QualityProfileQualityItemResource>;
+
+            if (items.Any(i => i.Name.IsNotNullOrWhiteSpace() && i.Items.Empty()))
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+
+    public class QualityNameValidator<T> : PropertyValidator
+    {
+        public QualityNameValidator()
+            : base("Individual qualities should not be named")
+        {
+
+        }
+
+        protected override bool IsValid(PropertyValidatorContext context)
+        {
+            var items = context.PropertyValue as IList<QualityProfileQualityItemResource>;
+
+            if (items.Any(i => i.Name.IsNotNullOrWhiteSpace() && i.Quality != null))
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+
+    public class ItemGroupNameValidator<T> : PropertyValidator
+    {
+        public ItemGroupNameValidator()
+            : base("Groups must have a name")
+        {
+
+        }
+
+        protected override bool IsValid(PropertyValidatorContext context)
+        {
+            var items = context.PropertyValue as IList<QualityProfileQualityItemResource>;
+
+            if (items.Any(i => i.Quality == null && i.Name.IsNullOrWhiteSpace()))
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+
+    public class ItemGroupIdValidator<T> : PropertyValidator
+    {
+        public ItemGroupIdValidator()
+            : base("Groups must have an ID")
+        {
+
+        }
+
+        protected override bool IsValid(PropertyValidatorContext context)
+        {
+            var items = context.PropertyValue as IList<QualityProfileQualityItemResource>;
+
+            if (items.Any(i => i.Quality == null && i.Id == 0))
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+
+    public class UniqueIdValidator<T> : PropertyValidator
+    {
+        public UniqueIdValidator()
+            : base("Groups must have a unique ID")
+        {
+
+        }
+
+        protected override bool IsValid(PropertyValidatorContext context)
+        {
+            var items = context.PropertyValue as IList<QualityProfileQualityItemResource>;
+
+            if (items.Where(i => i.Id > 0).Select(i => i.Id).GroupBy(i => i).Any(g => g.Count() > 1))
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+
+    public class UniqueQualityIdValidator<T> : PropertyValidator
+    {
+        public UniqueQualityIdValidator()
+            : base("Qualities can only be used once")
+        {
+
+        }
+
+        protected override bool IsValid(PropertyValidatorContext context)
+        {
+            var items = context.PropertyValue as IList<QualityProfileQualityItemResource>;
+            var qualityIds = new HashSet<int>();
+
+            foreach (var item in items)
+            {
+                if (item.Id > 0)
+                {
+                    foreach (var quality in item.Items)
+                    {
+                        if (qualityIds.Contains(quality.Quality.Id))
+                        {
+                            return false;
+                        }
+
+                        qualityIds.Add(quality.Quality.Id);
+                    }
+                }
+
+                else
+                {
+                    if (qualityIds.Contains(item.Quality.Id))
+                    {
+                        return false;
+                    }
+
+                    qualityIds.Add(item.Quality.Id);
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileModule.cs b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileModule.cs
index 58ac1192d..2febd47ad 100644
--- a/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileModule.cs
+++ b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileModule.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using FluentValidation;
 using NzbDrone.Core.Profiles.Qualities;
 using Lidarr.Http;
@@ -13,8 +13,10 @@ namespace Lidarr.Api.V1.Profiles.Quality
         {
             _profileService = profileService;
             SharedValidator.RuleFor(c => c.Name).NotEmpty();
-            SharedValidator.RuleFor(c => c.Cutoff).NotNull();
-            SharedValidator.RuleFor(c => c.Items).MustHaveAllowedQuality();
+            // TODO: Need to validate the cutoff is allowed and the ID/quality ID exists
+            // TODO: Need to validate the Items to ensure groups have names and at no item has no name, no items and no quality
+            SharedValidator.RuleFor(c => c.Cutoff).ValidCutoff();
+            SharedValidator.RuleFor(c => c.Items).ValidItems();
 
             GetResourceAll = GetAll;
             GetResourceById = GetById;
@@ -52,4 +54,4 @@ namespace Lidarr.Api.V1.Profiles.Quality
             return _profileService.All().ToResource();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileResource.cs b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileResource.cs
index 8820339b6..d144ed30c 100644
--- a/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileResource.cs
+++ b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileResource.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Core.Profiles.Qualities;
 using Lidarr.Http.REST;
@@ -8,14 +8,21 @@ namespace Lidarr.Api.V1.Profiles.Quality
     public class QualityProfileResource : RestResource
     {
         public string Name { get; set; }
-        public NzbDrone.Core.Qualities.Quality Cutoff { get; set; }
+        public int Cutoff { get; set; }
         public List<QualityProfileQualityItemResource> Items { get; set; }
     }
 
     public class QualityProfileQualityItemResource : RestResource
     {
+        public string Name { get; set; }
         public NzbDrone.Core.Qualities.Quality Quality { get; set; }
+        public List<QualityProfileQualityItemResource> Items { get; set; }
         public bool Allowed { get; set; }
+
+        public QualityProfileQualityItemResource()
+        {
+            Items = new List<QualityProfileQualityItemResource>();
+        }
     }
 
     public static class ProfileResourceMapper
@@ -27,7 +34,6 @@ namespace Lidarr.Api.V1.Profiles.Quality
             return new QualityProfileResource
             {
                 Id = model.Id,
-
                 Name = model.Name,
                 Cutoff = model.Cutoff,
                 Items = model.Items.ConvertAll(ToResource),
@@ -40,7 +46,10 @@ namespace Lidarr.Api.V1.Profiles.Quality
 
             return new QualityProfileQualityItemResource
             {
+                Id = model.Id,
+                Name = model.Name,
                 Quality = model.Quality,
+                Items = model.Items.ConvertAll(ToResource),
                 Allowed = model.Allowed
             };
         }
@@ -52,9 +61,8 @@ namespace Lidarr.Api.V1.Profiles.Quality
             return new Profile
             {
                 Id = resource.Id,
-
                 Name = resource.Name,
-                Cutoff = (NzbDrone.Core.Qualities.Quality)resource.Cutoff.Id,
+                Cutoff = resource.Cutoff,
                 Items = resource.Items.ConvertAll(ToModel)
             };
         }
@@ -65,7 +73,10 @@ namespace Lidarr.Api.V1.Profiles.Quality
 
             return new ProfileQualityItem
             {
-                Quality = (NzbDrone.Core.Qualities.Quality)resource.Quality.Id,
+                Id = resource.Id,
+                Name = resource.Name,
+                Quality = resource.Quality != null ? (NzbDrone.Core.Qualities.Quality)resource.Quality.Id : null,
+                Items = resource.Items.ConvertAll(ToModel),
                 Allowed = resource.Allowed
             };
         }
@@ -75,4 +86,4 @@ namespace Lidarr.Api.V1.Profiles.Quality
             return models.Select(ToResource).ToList();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileSchemaModule.cs b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileSchemaModule.cs
index b55020594..2e2dc6959 100644
--- a/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileSchemaModule.cs
+++ b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileSchemaModule.cs
@@ -1,34 +1,52 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using NzbDrone.Core.Profiles.Qualities;
-using NzbDrone.Core.Qualities;
 using Lidarr.Http;
 
 namespace Lidarr.Api.V1.Profiles.Quality
 {
     public class QualityProfileSchemaModule : LidarrRestModule<QualityProfileResource>
     {
-        private readonly IQualityDefinitionService _qualityDefinitionService;
-
-        public QualityProfileSchemaModule(IQualityDefinitionService qualityDefinitionService)
+        public QualityProfileSchemaModule()
             : base("/qualityprofile/schema")
         {
-            _qualityDefinitionService = qualityDefinitionService;
-
             GetResourceSingle = GetSchema;
         }
 
         private QualityProfileResource GetSchema()
         {
-            var items = _qualityDefinitionService.All()
-                .OrderBy(v => v.Weight)
-                .Select(v => new ProfileQualityItem { Quality = v.Quality, Allowed = false })
-                .ToList();
+            var groupedQualites = NzbDrone.Core.Qualities.Quality.DefaultQualityDefinitions.GroupBy(q => q.Weight);
+            var items = new List<ProfileQualityItem>();
+            var groupId = 1000;
+
+            foreach (var group in groupedQualites)
+            {
+                if (group.Count() == 1)
+                {
+                    items.Add(new ProfileQualityItem { Quality = group.First().Quality, Allowed = false });
+                    continue;
+                }
+
+                items.Add(new ProfileQualityItem
+                {
+                    Id = groupId,
+                    Name = group.First().GroupName,
+                    Items = group.Select(g => new ProfileQualityItem
+                    {
+                        Quality = g.Quality,
+                        Allowed = false
+                    }).ToList(),
+                    Allowed = false
+                });
+
+                groupId++;
+            }
 
             var qualityProfile = new Profile();
-            qualityProfile.Cutoff = NzbDrone.Core.Qualities.Quality.Unknown;
+            qualityProfile.Cutoff = NzbDrone.Core.Qualities.Quality.Unknown.Id;
             qualityProfile.Items = items;
 
             return qualityProfile.ToResource();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileValidation.cs b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileValidation.cs
deleted file mode 100644
index 5481bd07a..000000000
--- a/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileValidation.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using FluentValidation;
-using FluentValidation.Validators;
-
-namespace Lidarr.Api.V1.Profiles.Quality
-{
-    public static class QualityProfileValidation
-    {
-        public static IRuleBuilderOptions<T, IList<QualityProfileQualityItemResource>> MustHaveAllowedQuality<T>(this IRuleBuilder<T, IList<QualityProfileQualityItemResource>> ruleBuilder)
-        {
-            ruleBuilder.SetValidator(new NotEmptyValidator(null));
-
-            return ruleBuilder.SetValidator(new AllowedValidator<T>());
-        }
-    }
-
-    public class AllowedValidator<T> : PropertyValidator
-    {
-        public AllowedValidator()
-            : base("Must contain at least one allowed quality")
-        {
-
-        }
-
-        protected override bool IsValid(PropertyValidatorContext context)
-        {
-            var list = context.PropertyValue as IList<QualityProfileQualityItemResource>;
-
-            if (list == null)
-            {
-                return false;
-            }
-
-            if (!list.Any(c => c.Allowed))
-            {
-                return false;
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/src/Lidarr.Api.V1/Tracks/TrackResource.cs b/src/Lidarr.Api.V1/Tracks/TrackResource.cs
index d3331a90d..a940d6fa6 100644
--- a/src/Lidarr.Api.V1/Tracks/TrackResource.cs
+++ b/src/Lidarr.Api.V1/Tracks/TrackResource.cs
@@ -15,14 +15,15 @@ namespace Lidarr.Api.V1.Tracks
         public int TrackFileId { get; set; }
         public int AlbumId { get; set; }
         public bool Explicit { get; set; }
-        public int TrackNumber { get; set; }
+        public int AbsoluteTrackNumber { get; set; }
+        public string TrackNumber { get; set; }
         public string Title { get; set; }
         public int Duration { get; set; }
         public TrackFileResource TrackFile { get; set; }
-
+        public int MediumNumber { get; set; }
         public bool HasFile { get; set; }
         public bool Monitored { get; set; }
-        //public string SeriesTitle { get; set; }
+
         public ArtistResource Artist { get; set; }
         public Ratings Ratings { get; set; }
 
@@ -45,16 +46,14 @@ namespace Lidarr.Api.V1.Tracks
                 TrackFileId = model.TrackFileId,
                 AlbumId = model.AlbumId,
                 Explicit = model.Explicit,
+                AbsoluteTrackNumber = model.AbsoluteTrackNumber,
                 TrackNumber = model.TrackNumber,
                 Title = model.Title,
                 Duration = model.Duration,
-                //EpisodeFile
-
+                MediumNumber = model.MediumNumber,
                 HasFile = model.HasFile,
                 Monitored = model.Monitored,
                 Ratings = model.Ratings,
-                //SeriesTitle = model.SeriesTitle,
-                //Series = model.Series.MapToResource(),
             };
         }
 
diff --git a/src/NzbDrone.Core.Test/Datastore/MarrDataLazyLoadingFixture.cs b/src/NzbDrone.Core.Test/Datastore/MarrDataLazyLoadingFixture.cs
index f4c9d7cba..0bda7e67f 100644
--- a/src/NzbDrone.Core.Test/Datastore/MarrDataLazyLoadingFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/MarrDataLazyLoadingFixture.cs
@@ -22,7 +22,7 @@ namespace NzbDrone.Core.Test.Datastore
             var profile = new Profile
             {
                 Name = "Test",
-                Cutoff = Quality.MP3_320,
+                Cutoff = Quality.MP3_320.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities()
             };
 
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs
index 81adab1aa..3f88b8db1 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs
@@ -20,7 +20,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
              new Profile
 
              {
-                 Cutoff = Quality.MP3_256,
+                 Cutoff = Quality.MP3_256.Id,
                  Items = Qualities.QualityFixture.GetDefaultQualities()
              },
              new LanguageProfile
@@ -37,7 +37,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             Subject.CutoffNotMet(
             new Profile
             {
-                Cutoff = Quality.MP3_256,
+                Cutoff = Quality.MP3_256.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities()
             },
             new LanguageProfile
@@ -55,7 +55,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             new Profile
 
             {
-                Cutoff = Quality.MP3_256,
+                Cutoff = Quality.MP3_256.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities()
             },
             new LanguageProfile
@@ -73,7 +73,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             new Profile
 
             {
-                Cutoff = Quality.MP3_320,
+                Cutoff = Quality.MP3_320.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities()
             },
             new LanguageProfile
@@ -93,7 +93,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             new Profile
 
             {
-                Cutoff = Quality.MP3_320,
+                Cutoff = Quality.MP3_320.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities()
             },
             new LanguageProfile
@@ -111,7 +111,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Profile _profile = new Profile
             {
-                Cutoff = Quality.MP3_320,
+                Cutoff = Quality.MP3_320.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
             };
 
@@ -134,7 +134,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Profile _profile = new Profile
             {
-                Cutoff = Quality.MP3_320,
+                Cutoff = Quality.MP3_320.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
             };
 
@@ -158,7 +158,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Profile _profile = new Profile
             {
-                Cutoff = Quality.MP3_320,
+                Cutoff = Quality.MP3_320.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
             };
 
@@ -182,7 +182,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Profile _profile = new Profile
             {
-                Cutoff = Quality.MP3_320,
+                Cutoff = Quality.MP3_320.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
             };
 
@@ -206,7 +206,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Profile _profile = new Profile
             {
-                Cutoff = Quality.MP3_320,
+                Cutoff = Quality.MP3_320.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
             };
 
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/HistorySpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/HistorySpecificationFixture.cs
index 18f92f69d..f41e2e494 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/HistorySpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/HistorySpecificationFixture.cs
@@ -47,7 +47,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                                        };
 
             _fakeArtist = Builder<Artist>.CreateNew()
-                         .With(c => c.Profile = new Profile { Cutoff = Quality.MP3_512, Items = Qualities.QualityFixture.GetDefaultQualities() })
+                         .With(c => c.Profile = new Profile { Cutoff = Quality.MP3_512.Id, Items = Qualities.QualityFixture.GetDefaultQualities() })
                          .With(l => l.LanguageProfile = new LanguageProfile { Cutoff = Language.Spanish, Languages = LanguageFixture.GetDefaultLanguages() })
                          .Build();
 
@@ -162,7 +162,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_not_be_upgradable_if_album_is_of_same_quality_as_existing()
         {
-            _fakeArtist.Profile = new Profile { Cutoff = Quality.MP3_512, Items = Qualities.QualityFixture.GetDefaultQualities() };
+            _fakeArtist.Profile = new Profile { Cutoff = Quality.MP3_512.Id, Items = Qualities.QualityFixture.GetDefaultQualities() };
             _parseResultSingle.ParsedAlbumInfo.Quality = new QualityModel(Quality.MP3_512, new Revision(version: 1));
             _upgradableQuality = new Tuple<QualityModel, Language>(new QualityModel(Quality.MP3_512, new Revision(version: 1)), Language.English);
 
@@ -174,7 +174,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_not_be_upgradable_if_cutoff_already_met()
         {
-            _fakeArtist.Profile = new Profile { Cutoff = Quality.MP3_512, Items = Qualities.QualityFixture.GetDefaultQualities() };
+            _fakeArtist.Profile = new Profile { Cutoff = Quality.MP3_512.Id, Items = Qualities.QualityFixture.GetDefaultQualities() };
             _parseResultSingle.ParsedAlbumInfo.Quality = new QualityModel(Quality.MP3_512, new Revision(version: 1));
             _upgradableQuality = new Tuple<QualityModel, Language>(new QualityModel(Quality.MP3_512, new Revision(version: 1)), Language.Spanish);
 
@@ -202,7 +202,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         public void should_return_false_if_cutoff_already_met_and_cdh_is_disabled()
         {
             GivenCdhDisabled();
-            _fakeArtist.Profile = new Profile { Cutoff = Quality.MP3_512, Items = Qualities.QualityFixture.GetDefaultQualities() };
+            _fakeArtist.Profile = new Profile { Cutoff = Quality.MP3_512.Id, Items = Qualities.QualityFixture.GetDefaultQualities() };
             _parseResultSingle.ParsedAlbumInfo.Quality = new QualityModel(Quality.MP3_512, new Revision(version: 1));
             _upgradableQuality = new Tuple<QualityModel, Language>(new QualityModel(Quality.MP3_512, new Revision(version: 1)), Language.Spanish);
 
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs
index 2fc4cf993..c75421026 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs
@@ -35,7 +35,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         public void Setup()
         {
             var fakeArtist = Builder<Artist>.CreateNew()
-                         .With(c => c.Profile = (LazyLoaded<Profile>)new Profile { Cutoff = Quality.MP3_512 })
+                         .With(c => c.Profile = (LazyLoaded<Profile>)new Profile { Cutoff = Quality.MP3_512.Id })
                          .Build();
 
             remoteAlbum = new RemoteAlbum
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs
index 7461f4ca2..fced89fe8 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs
@@ -79,7 +79,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var profile = new Profile
             {
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
-                Cutoff = cutoff,
+                Cutoff = cutoff.Id,
             };
 
             var langProfile = new LanguageProfile
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/QueueSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/QueueSpecificationFixture.cs
index 2e51b0989..7ebe87ed0 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/QueueSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/QueueSpecificationFixture.cs
@@ -103,7 +103,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_return_true_when_quality_in_queue_is_lower()
         {
-            _artist.Profile.Value.Cutoff = Quality.MP3_512;
+            _artist.Profile.Value.Cutoff = Quality.MP3_512.Id;
             _artist.LanguageProfile.Value.Cutoff = Language.Spanish;
 
             var remoteAlbum = Builder<RemoteAlbum>.CreateNew()
@@ -123,7 +123,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_return_true_when_quality_in_queue_is_lower_but_language_is_higher()
         {
-            _artist.Profile.Value.Cutoff = Quality.FLAC;
+            _artist.Profile.Value.Cutoff = Quality.FLAC.Id;
             _artist.LanguageProfile.Value.Cutoff = Language.Spanish;
 
             var remoteAlbum = Builder<RemoteAlbum>.CreateNew()
@@ -193,7 +193,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_return_false_when_quality_in_queue_is_better()
         {
-            _artist.Profile.Value.Cutoff = Quality.MP3_512;
+            _artist.Profile.Value.Cutoff = Quality.MP3_512.Id;
 
             var remoteAlbum = Builder<RemoteAlbum>.CreateNew()
                                                       .With(r => r.Artist = _artist)
@@ -289,7 +289,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_return_false_if_quality_and_language_in_queue_meets_cutoff()
         {
-            _artist.Profile.Value.Cutoff = _remoteAlbum.ParsedAlbumInfo.Quality.Quality;
+            _artist.Profile.Value.Cutoff = _remoteAlbum.ParsedAlbumInfo.Quality.Quality.Id;
 
             var remoteAlbum = Builder<RemoteAlbum>.CreateNew()
                                                       .With(r => r.Artist = _artist)
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs
index 35c174ccf..f16d98608 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs
@@ -59,7 +59,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
             _profile.Items.Add(new ProfileQualityItem { Allowed = true, Quality = Quality.MP3_320 });
             _profile.Items.Add(new ProfileQualityItem { Allowed = true, Quality = Quality.MP3_320 });
 
-            _profile.Cutoff = Quality.MP3_320;
+            _profile.Cutoff = Quality.MP3_320.Id;
 
             _langProfile.Cutoff = Language.Spanish;
             _langProfile.Languages = Languages.LanguageFixture.GetDefaultLanguages();
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DeletedTrackFileSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DeletedTrackFileSpecificationFixture.cs
index 173b061e3..70542bff5 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DeletedTrackFileSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DeletedTrackFileSpecificationFixture.cs
@@ -60,7 +60,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
             var secondTrack = new Track { TrackFile = _secondFile, TrackFileId = 2, AlbumId = 2 };
 
             var fakeArtist = Builder<Artist>.CreateNew()
-                         .With(c => c.Profile = new Profile { Cutoff = Quality.FLAC })
+                         .With(c => c.Profile = new Profile { Cutoff = Quality.FLAC.Id })
                          .With(c => c.Path = @"C:\Music\My.Artist".AsOsAgnostic())
                          .Build();
 
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/ProperSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/ProperSpecificationFixture.cs
index ab557ef4b..d69870d64 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/ProperSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/ProperSpecificationFixture.cs
@@ -40,7 +40,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
 
 
             var fakeArtist = Builder<Artist>.CreateNew()
-                         .With(c => c.Profile = new Profile { Cutoff = Quality.FLAC })
+                         .With(c => c.Profile = new Profile { Cutoff = Quality.FLAC.Id })
                          .Build();
 
             Mocker.GetMock<IMediaFileService>()
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs
index d66b23b0c..baa49c340 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs
@@ -40,7 +40,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var languages = Languages.LanguageFixture.GetDefaultLanguages(Language.English, Language.Spanish);
 
             var fakeArtist = Builder<Artist>.CreateNew()
-                         .With(c => c.Profile = new Profile { Cutoff = Quality.MP3_512, Items = Qualities.QualityFixture.GetDefaultQualities()})
+                         .With(c => c.Profile = new Profile { Cutoff = Quality.MP3_512.Id, Items = Qualities.QualityFixture.GetDefaultQualities()})
                          .With(l => l.LanguageProfile = new LanguageProfile { Cutoff = Language.Spanish, Languages = languages })
                          .Build();
 
diff --git a/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/AddFixture.cs b/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/AddFixture.cs
index c245ba895..f98c66dc3 100644
--- a/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/AddFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/AddFixture.cs
@@ -39,7 +39,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
             _profile = new Profile
                        {
                            Name = "Test",
-                           Cutoff = Quality.MP3_256,
+                           Cutoff = Quality.MP3_256.Id,
                            Items = new List<ProfileQualityItem>
                                    {
                                        new ProfileQualityItem { Allowed = true, Quality = Quality.MP3_256 },
diff --git a/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveGrabbedFixture.cs b/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveGrabbedFixture.cs
index ec98ba123..cf72a88d4 100644
--- a/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveGrabbedFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveGrabbedFixture.cs
@@ -39,7 +39,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
             _profile = new Profile
                        {
                            Name = "Test",
-                           Cutoff = Quality.MP3_256,
+                           Cutoff = Quality.MP3_256.Id,
                            Items = new List<ProfileQualityItem>
                                    {
                                        new ProfileQualityItem { Allowed = true, Quality = Quality.MP3_256 },
diff --git a/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveRejectedFixture.cs b/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveRejectedFixture.cs
index da3d791fa..05ae539ad 100644
--- a/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveRejectedFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveRejectedFixture.cs
@@ -41,7 +41,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
             _profile = new Profile
                        {
                            Name = "Test",
-                           Cutoff = Quality.MP3_192,
+                           Cutoff = Quality.MP3_192.Id,
                            Items = new List<ProfileQualityItem>
                                    {
                                        new ProfileQualityItem { Allowed = true, Quality = Quality.MP3_192 },
diff --git a/src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs b/src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs
index 898d43033..fa10cfb0f 100644
--- a/src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs
@@ -30,14 +30,14 @@ namespace NzbDrone.Core.Test.HistoryTests
         {
             _profile = new Profile
             {
-                Cutoff = Quality.MP3_320,
+                Cutoff = Quality.MP3_320.Id,
                 Items = QualityFixture.GetDefaultQualities(),
             };
 
             _profileCustom = new Profile
 
             {
-                Cutoff = Quality.MP3_320,
+                Cutoff = Quality.MP3_320.Id,
                 Items = QualityFixture.GetDefaultQualities(Quality.MP3_256),
 
             };
diff --git a/src/NzbDrone.Core.Test/MusicTests/ArtistRepositoryTests/ArtistRepositoryFixture.cs b/src/NzbDrone.Core.Test/MusicTests/ArtistRepositoryTests/ArtistRepositoryFixture.cs
new file mode 100644
index 000000000..2f01d0f92
--- /dev/null
+++ b/src/NzbDrone.Core.Test/MusicTests/ArtistRepositoryTests/ArtistRepositoryFixture.cs
@@ -0,0 +1,53 @@
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using System.Linq;
+using NzbDrone.Core.Languages;
+using NzbDrone.Core.Profiles.Qualities;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Music;
+using NzbDrone.Core.Profiles.Languages;
+
+namespace NzbDrone.Core.Test.MusicTests.ArtistRepositoryTests
+{
+    [TestFixture]
+
+    public class ArtistRepositoryFixture : DbTest<ArtistRepository, Artist>
+    {
+        [Test]
+        public void should_lazyload_quality_profile()
+        {
+            var profile = new Profile
+            {
+                Items = Qualities.QualityFixture.GetDefaultQualities(Quality.FLAC, Quality.MP3_192, Quality.MP3_320),
+
+                Cutoff = Quality.FLAC.Id,
+                Name = "TestProfile"
+            };
+
+            var langProfile = new LanguageProfile
+            {
+                Name = "TestProfile",
+                Languages = Languages.LanguageFixture.GetDefaultLanguages(Language.English),
+                Cutoff = Language.English
+            };
+
+
+            Mocker.Resolve<ProfileRepository>().Insert(profile);
+            Mocker.Resolve<LanguageProfileRepository>().Insert(langProfile);
+
+            var series = Builder<Artist>.CreateNew().BuildNew();
+            series.ProfileId = profile.Id;
+            series.LanguageProfileId = langProfile.Id;
+
+            Subject.Insert(series);
+
+
+            StoredModel.Profile.Should().NotBeNull();
+            StoredModel.LanguageProfile.Should().NotBeNull();
+
+
+        }
+    }
+}
diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index 2326c120a..da4c8d376 100644
--- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -270,11 +270,14 @@
     <Compile Include="MetadataSource\SkyHook\SkyHookProxyFixture.cs" />
     <Compile Include="MusicTests\AddArtistFixture.cs" />
     <Compile Include="MusicTests\ArtistNameSlugValidatorFixture.cs" />
+    <Compile Include="MusicTests\ArtistRepositoryTests\ArtistRepositoryFixture.cs" />
     <Compile Include="NotificationTests\NotificationBaseFixture.cs" />
     <Compile Include="NotificationTests\SynologyIndexerFixture.cs" />
     <Compile Include="OrganizerTests\FileNameBuilderTests\CleanTitleFixture.cs" />
     <Compile Include="OrganizerTests\FileNameBuilderTests\TitleTheFixture.cs" />
     <Compile Include="ParserTests\MusicParserFixture.cs" />
+    <Compile Include="Profiles\Delay\DelayProfileServiceFixture.cs" />
+    <Compile Include="Profiles\Qualities\QualityIndexCompareToFixture.cs" />
     <Compile Include="Qualities\RevisionComparableFixture.cs" />
     <Compile Include="QueueTests\QueueServiceFixture.cs" />
     <Compile Include="RemotePathMappingsTests\RemotePathMappingServiceFixture.cs" />
diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs
index a13a313e9..3350085e1 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using FizzWare.NBuilder;
 using FluentAssertions;
@@ -35,7 +35,7 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
 
             _track = Builder<Track>.CreateNew()
                             .With(e => e.Title = "Doing Time")
-                            .With(e => e.TrackNumber = 3)
+                            .With(e => e.AbsoluteTrackNumber = 3)
                             .Build();
 
             _trackFile = new TrackFile { Quality = new QualityModel(Quality.MP3_256), ReleaseGroup = "LidarrTest" };
diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs
index fefa3eb6a..e4b982f1d 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs
@@ -45,7 +45,7 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
 
             _track1 = Builder<Track>.CreateNew()
                             .With(e => e.Title = "City Sushi")
-                            .With(e => e.TrackNumber = 6)
+                            .With(e => e.AbsoluteTrackNumber = 6)
                             .Build();
 
             _trackFile = new TrackFile { Quality = new QualityModel(Quality.MP3_256), ReleaseGroup = "LidarrTest" };
@@ -232,7 +232,7 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
         [Test]
         public void should_replace_track_number_with_single_digit()
         {
-            _track1.TrackNumber = 1;
+            _track1.AbsoluteTrackNumber = 1;
             _namingConfig.StandardTrackFormat = "{track}";
 
             Subject.BuildTrackFileName(new List<Track> { _track1 }, _artist, _album, _trackFile)
@@ -242,7 +242,7 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
         [Test]
         public void should_replace_track00_number_with_two_digits()
         {
-            _track1.TrackNumber = 1;
+            _track1.AbsoluteTrackNumber = 1;
             _namingConfig.StandardTrackFormat = "{track:00}";
 
             Subject.BuildTrackFileName(new List<Track> { _track1 }, _artist, _album, _trackFile)
@@ -330,7 +330,7 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
 
             var track = Builder<Track>.CreateNew()
                             .With(e => e.Title = "Part 1")
-                            .With(e => e.TrackNumber = 6)
+                            .With(e => e.AbsoluteTrackNumber = 6)
                             .Build();
 
             Subject.BuildTrackFileName(new List<Track> { track }, new Artist { Name = "In The Woods." }, new Album { Title = "30 Rock" }, _trackFile)
@@ -344,7 +344,7 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
 
             var track = Builder<Track>.CreateNew()
                             .With(e => e.Title = "Part 1")
-                            .With(e => e.TrackNumber = 6)
+                            .With(e => e.AbsoluteTrackNumber = 6)
                             .Build();
 
             Subject.BuildTrackFileName(new List<Track> { track }, new Artist { Name = "In The Woods..." }, new Album { Title = "30 Rock" }, _trackFile)
diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleTheFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleTheFixture.cs
index ee407d3e0..8621f9f40 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleTheFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleTheFixture.cs
@@ -35,7 +35,7 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
 
             _track = Builder<Track>.CreateNew()
                             .With(e => e.Title = "City Sushi")
-                            .With(e => e.TrackNumber = 6)
+                            .With(e => e.AbsoluteTrackNumber = 6)
                             .Build();
 
             _trackFile = new TrackFile { Quality = new QualityModel(Quality.MP3_320), ReleaseGroup = "LidarrTest" };
diff --git a/src/NzbDrone.Core.Test/ParserTests/ParserFixture.cs b/src/NzbDrone.Core.Test/ParserTests/ParserFixture.cs
index 984bd6a1f..3a541227f 100644
--- a/src/NzbDrone.Core.Test/ParserTests/ParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/ParserFixture.cs
@@ -38,7 +38,7 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("[ www.Torrenting.com ] - Revenge.S03E14.720p.HDTV.X264-DIMENSION", "Revenge")]
         [TestCase("Seed S02E09 HDTV x264-2HD [eztv]-[rarbg.com]", "Seed")]
         [TestCase("Reno.911.S01.DVDRip.DD2.0.x264-DEEP", "Reno 911")]
-        public void should_parse_series_name(string postTitle, string title)
+        public void should_parse_artist_name(string postTitle, string title)
         {
             var result = Parser.Parser.ParseArtistName(postTitle).CleanArtistName();
             result.Should().Be(title.CleanArtistName());
@@ -72,51 +72,58 @@ namespace NzbDrone.Core.Test.ParserTests
             Parser.Parser.ParseAlbumTitle(title).Quality.QualitySource.Should().Be(QualitySource.Extension);
         }
 
-        [TestCase("VA - The Best 101 Love Ballads (2017) MP3 [192 kbps]", "The Best 101 Love Ballads")]
-        [TestCase("ATCQ - The Love Movement 1998 2CD 192kbps  RIP", "The Love Movement")]
-        [TestCase("A Tribe Called Quest - The Love Movement 1998 2CD [192kbps] RIP", "The Love Movement")]
-        [TestCase("Maula - Jism 2 [2012] Mp3 - 192Kbps [Extended]- TK", "Jism 2")]
-        [TestCase("VA - Complete Clubland - The Ultimate Ride Of Your Lfe [2014][MP3][192 kbps]")]
-        [TestCase("Complete Clubland - The Ultimate Ride Of Your Lfe [2014][MP3](192kbps)", "The Ultimate Ride Of Your Lfe")]
-        [TestCase("The Ultimate Ride Of Your Lfe [192 KBPS][2014][MP3]", "The Ultimate Ride Of Your Lfe")]
-        [TestCase("Gary Clark Jr - Live North America 2016 (2017) MP3 192kbps", "Live North America 2016")]
-        [TestCase("Beyoncé Lemonade [320] 2016 Beyonce Lemonade [320] 2016", "Lemonade")]
-        [TestCase("Childish Gambino - Awaken, My Love Album 2016 mp3 320 Kbps", "Awaken, My Love Album")]
-        [TestCase("Maluma – Felices Los 4 MP3 320 Kbps 2017 Download", "Felices Los 4")]
-        [TestCase("Ricardo Arjona - APNEA (Single 2014) (320 kbps)", "APNEA")]
-        [TestCase("Kehlani - SweetSexySavage (Deluxe Edition) (2017) 320", "SweetSexySavage")]
-        [TestCase("Anderson Paak - Malibu (320)(2016)", "Malibu")]
-        [TestCase("Caetano Veloso Discografia Completa MP3 @256","")]
-        [TestCase("Little Mix - Salute [Deluxe Edition] [2013] [M4A-256]-V3nom [GLT", "Salute")]
-        [TestCase("Ricky Martin - A Quien Quiera Escuchar (2015) 256 kbps [GloDLS]", "A Quien Quiera Escuchar")]
-        [TestCase("Jake Bugg - Jake Bugg (Album) [2012] {MP3 256 kbps}", "Jake Bugg")]
-        [TestCase("Milky Chance - Sadnecessary [256 Kbps] [M4A]", "Sadnecessary")]
-        [TestCase("Clean Bandit - New Eyes [2014] [Mp3-256]-V3nom [GLT]", "New Eyes")]
-        [TestCase("Armin van Buuren - A State Of Trance 810 (20.04.2017) 256 kbps", "A State Of Trance 810")]
-        [TestCase("PJ Harvey - Let England Shake [mp3-256-2011][trfkad]", "Let England Shake")]
-        [TestCase("X-Men Soundtracks (2006-2014) AAC, 256 kbps","")]
-        [TestCase("Walk the Line Soundtrack (2005) [AAC, 256 kbps]", "Walk the Line Soundtrack")]
-        [TestCase("Emeli Sande Next To Me (512 Kbps)", "Next To Me")]
-        [TestCase("Kendrick Lamar - DAMN (2017) FLAC", "DAMN")]
-        [TestCase("Alicia Keys - Vault Playlist Vol. 1 (2017) [FLAC CD]", "Vault Playlist Vol  1")]
-        [TestCase("Gorillaz - Humanz (Deluxe) - lossless FLAC Tracks - 2017 - CDrip", "Humanz")]
-        [TestCase("David Bowie - Blackstar (2016) [FLAC]", "Blackstar")]
-        [TestCase("The Cure - Greatest Hits (2001) FLAC Soup", "Greatest Hits")]
-        [TestCase("Slowdive - Souvlaki (FLAC)", "Souvlaki")]
-        [TestCase("John Coltrane - Kulu Se Mama (1965) [EAC-FLAC]", "Kulu Se Mama")]
-        [TestCase("The Rolling Stones - The Very Best Of '75-'94 (1995) {FLAC}", "The Very Best Of '75-'94")]
-        [TestCase("Migos-No_Label_II-CD-FLAC-2014-FORSAKEN", "No Label II")]
-        [TestCase("ADELE 25 CD FLAC 2015 PERFECT", "25")]
-        [TestCase("A.I. - Sex & Robots [2007/MP3/V0(VBR)]", "Sex & Robots")]
-        [TestCase("Jay-Z - 4:44 (Deluxe Edition) (2017) 320", "444")]
-        [TestCase("Roberta Flack 2006 - The Very Best of", "The Very Best of")]
-        [TestCase("VA - NOW Thats What I Call Music 96 (2017) [Mp3~Kbps]", "NOW Thats What I Call Music 96")]
-        [TestCase("Queen - The Ultimate Best Of Queen(2011)[mp3]", "The Ultimate Best Of Queen")]
-        [TestCase("Little Mix - Salute [Deluxe Edition] [2013] [M4A-256]-V3nom [GLT]", "Salute")]
-        [TestCase("Barış Manço - Ben Bilirim [1993/FLAC/Lossless/Log]", "Ben Bilirim")]
-        public void should_parse_album_title(string postTitle, string title)
+        [TestCase("VA - The Best 101 Love Ballads (2017) MP3 [192 kbps]", "VA", "The Best 101 Love Ballads")]
+        [TestCase("ATCQ - The Love Movement 1998 2CD 192kbps  RIP", "ATCQ", "The Love Movement")]
+        [TestCase("A Tribe Called Quest - The Love Movement 1998 2CD [192kbps] RIP", "A Tribe Called Quest", "The Love Movement")]
+        [TestCase("Maula - Jism 2 [2012] Mp3 - 192Kbps [Extended]- TK", "Maula", "Jism 2")]
+        [TestCase("VA - Complete Clubland - The Ultimate Ride Of Your Lfe [2014][MP3][192 kbps]", "VA", "")]
+        [TestCase("Complete Clubland - The Ultimate Ride Of Your Lfe [2014][MP3](192kbps)", "Complete Clubland", "The Ultimate Ride Of Your Lfe")]
+        [TestCase("The Ultimate Ride Of Your Lfe [192 KBPS][2014][MP3]", "", "The Ultimate Ride Of Your Lfe")]
+        [TestCase("Gary Clark Jr - Live North America 2016 (2017) MP3 192kbps", "Gary Clark Jr", "Live North America 2016")]
+        [TestCase("Beyoncé Lemonade [320] 2016 Beyonce Lemonade [320] 2016", "Beyoncé", "Lemonade")]
+        [TestCase("Childish Gambino - Awaken, My Love Album 2016 mp3 320 Kbps", "Childish Gambino", "Awaken, My Love Album")]
+        [TestCase("Maluma – Felices Los 4 MP3 320 Kbps 2017 Download", "Maluma", "Felices Los 4")]
+        [TestCase("Ricardo Arjona - APNEA (Single 2014) (320 kbps)", "Ricardo Arjona", "APNEA")]
+        [TestCase("Kehlani - SweetSexySavage (Deluxe Edition) (2017) 320", "Kehlani", "SweetSexySavage")]
+        [TestCase("Anderson Paak - Malibu (320)(2016)", "Anderson Paak", "Malibu")]
+        [TestCase("Caetano Veloso Discografia Completa MP3 @256", "Caetano Veloso", "")]
+        [TestCase("Little Mix - Salute [Deluxe Edition] [2013] [M4A-256]-V3nom [GLT", "Little Mix", "Salute")]
+        [TestCase("Ricky Martin - A Quien Quiera Escuchar (2015) 256 kbps [GloDLS]", "Ricky Martin", "A Quien Quiera Escuchar")]
+        [TestCase("Jake Bugg - Jake Bugg (Album) [2012] {MP3 256 kbps}", "Jake Bugg", "Jake Bugg")]
+        [TestCase("Milky Chance - Sadnecessary [256 Kbps] [M4A]", "Milky Chance", "Sadnecessary")]
+        [TestCase("Clean Bandit - New Eyes [2014] [Mp3-256]-V3nom [GLT]", "Clean Bandit", "New Eyes")]
+        [TestCase("Armin van Buuren - A State Of Trance 810 (20.04.2017) 256 kbps", "Armin van Buuren", "A State Of Trance 810")]
+        [TestCase("PJ Harvey - Let England Shake [mp3-256-2011][trfkad]", "PJ Harvey", "Let England Shake")]
+        [TestCase("X-Men Soundtracks (2006-2014) AAC, 256 kbps", "", "")]
+        [TestCase("Walk the Line Soundtrack (2005) [AAC, 256 kbps]", "", "Walk the Line Soundtrack")]
+        [TestCase("Emeli Sande Next To Me (512 Kbps)", "Emeli", "Next To Me")]
+        [TestCase("Kendrick Lamar - DAMN (2017) FLAC", "Kendrick Lamar", "DAMN")]
+        [TestCase("Alicia Keys - Vault Playlist Vol. 1 (2017) [FLAC CD]", "Alicia Keys", "Vault Playlist Vol  1")]
+        [TestCase("Gorillaz - Humanz (Deluxe) - lossless FLAC Tracks - 2017 - CDrip", "Gorillaz", "Humanz")]
+        [TestCase("David Bowie - Blackstar (2016) [FLAC]", "David Bowie", "Blackstar")]
+        [TestCase("The Cure - Greatest Hits (2001) FLAC Soup", "The Cure", "Greatest Hits")]
+        [TestCase("Slowdive - Souvlaki (FLAC)", "Slowdive", "Souvlaki")]
+        [TestCase("John Coltrane - Kulu Se Mama (1965) [EAC-FLAC]", "John Coltrane", "Kulu Se Mama")]
+        [TestCase("The Rolling Stones - The Very Best Of '75-'94 (1995) {FLAC}", "The Rolling Stones", "The Very Best Of '75-'94")]
+        [TestCase("Migos-No_Label_II-CD-FLAC-2014-FORSAKEN", "Migos", "No Label II")]
+        [TestCase("ADELE 25 CD FLAC 2015 PERFECT", "Adele", "25")]
+        [TestCase("A.I. - Sex & Robots [2007/MP3/V0(VBR)]", "A.I.", "Sex & Robots")]
+        [TestCase("Jay-Z - 4:44 (Deluxe Edition) (2017) 320", "Jay-Z", "444")]
+        [TestCase("Roberta Flack 2006 - The Very Best of", "Roberta Flack", "The Very Best of")]
+        [TestCase("VA - NOW Thats What I Call Music 96 (2017) [Mp3~Kbps]", "VA", "NOW Thats What I Call Music 96")]
+        [TestCase("Queen - The Ultimate Best Of Queen(2011)[mp3]", "Queen", "The Ultimate Best Of Queen")]
+        [TestCase("Little Mix - Salute [Deluxe Edition] [2013] [M4A-256]-V3nom [GLT]", "Little Mix", "Salute")]
+        [TestCase("Barış Manço - Ben Bilirim [1993/FLAC/Lossless/Log]", "Barış Manço", "Ben Bilirim")]
+        [TestCase("Imagine Dragons-Smoke And Mirrors-Deluxe Edition-2CD-FLAC-2015-JLM", "Imagine Dragons", "Smoke And Mirrors")]
+        [TestCase("Dani_Sbert-Togheter-WEB-2017-FURY", "Dani Sbert", "Togheter")]
+        [TestCase("New.Edition-One.Love-CD-FLAC-2017-MrFlac", "New Edition", "One Love")]
+        [TestCase("David_Gray-The_Best_of_David_Gray-(Deluxe_Edition)-2CD-2016-MTD", "David Gray", "The Best of David Gray")]
+        public void should_parse_artist_name_and_album_title(string postTitle, string name, string title)
         {
-            Parser.Parser.ParseAlbumTitle(postTitle).AlbumTitle.Should().Be(title);
+
+            var parseResult = Parser.Parser.ParseAlbumTitle(postTitle);
+            parseResult.ArtistName.Should().Be(name);
+            parseResult.AlbumTitle.Should().Be(title);
         }
     }
 }
diff --git a/src/NzbDrone.Core.Test/Profiles/Delay/DelayProfileServiceFixture.cs b/src/NzbDrone.Core.Test/Profiles/Delay/DelayProfileServiceFixture.cs
new file mode 100644
index 000000000..7fb8cbd6d
--- /dev/null
+++ b/src/NzbDrone.Core.Test/Profiles/Delay/DelayProfileServiceFixture.cs
@@ -0,0 +1,112 @@
+using System.Collections.Generic;
+using System.Linq;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Profiles.Delay;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Profiles.Delay
+{
+    [TestFixture]
+    public class DelayProfileServiceFixture : CoreTest<DelayProfileService>
+    {
+        private List<DelayProfile> _delayProfiles;
+        private DelayProfile _first;
+        private DelayProfile _last;
+
+        [SetUp]
+        public void Setup()
+        {
+            _delayProfiles = Builder<DelayProfile>.CreateListOfSize(4)
+                                                  .TheFirst(1)
+                                                  .With(d => d.Order = int.MaxValue)
+                                                  .TheNext(1)
+                                                  .With(d => d.Order = 1)
+                                                  .TheNext(1)
+                                                  .With(d => d.Order = 2)
+                                                  .TheNext(1)
+                                                  .With(d => d.Order = 3)
+                                                  .Build()
+                                                  .ToList();
+
+            _first = _delayProfiles[1];
+            _last = _delayProfiles.Last();
+
+            Mocker.GetMock<IDelayProfileRepository>()
+                  .Setup(s => s.All())
+                  .Returns(_delayProfiles);
+        }
+
+        [Test]
+        public void should_move_to_first_if_afterId_is_null()
+        {
+            var moving = _last;
+            var result = Subject.Reorder(moving.Id, null).OrderBy(d => d.Order).ToList();
+            var moved = result.First();
+            
+            moved.Id.Should().Be(moving.Id);
+            moved.Order.Should().Be(1);
+        }
+
+        [Test]
+        public void should_move_after_if_afterId_is_not_null()
+        {
+            var after = _first;
+            var moving = _last;
+            var result = Subject.Reorder(moving.Id, _first.Id).OrderBy(d => d.Order).ToList();
+            var moved = result[1];
+
+            moved.Id.Should().Be(moving.Id);
+            moved.Order.Should().Be(after.Order + 1);
+        }
+
+        [Test]
+        public void should_reorder_delay_profiles_that_are_after_moved()
+        {
+            var moving = _last;
+            var result = Subject.Reorder(moving.Id, null).OrderBy(d => d.Order).ToList();
+
+            for (int i = 1; i < result.Count; i++)
+            {
+                var delayProfile = result[i];
+
+                if (delayProfile.Id == 1)
+                {
+                    delayProfile.Order.Should().Be(int.MaxValue);
+                }
+
+                else
+                {
+                    delayProfile.Order.Should().Be(i + 1);
+                }
+            }
+        }
+
+        [Test]
+        public void should_not_change_afters_order_if_moving_was_after()
+        {
+            var after = _first;
+            var afterOrder = after.Order;
+            var moving = _last;
+            var result = Subject.Reorder(moving.Id, _first.Id).OrderBy(d => d.Order).ToList();
+            var afterMove = result.First();
+
+            afterMove.Id.Should().Be(after.Id);
+            afterMove.Order.Should().Be(afterOrder);
+        }
+
+        [Test]
+        public void should_change_afters_order_if_moving_was_before()
+        {
+            var after = _last;
+            var afterOrder = after.Order;
+            var moving = _first;
+
+            var result = Subject.Reorder(moving.Id, after.Id).OrderBy(d => d.Order).ToList();
+            var afterMove = result.Single(d => d.Id == after.Id);
+
+            afterMove.Order.Should().BeLessThan(afterOrder);
+        }
+    }
+}
diff --git a/src/NzbDrone.Core.Test/Profiles/ProfileRepositoryFixture.cs b/src/NzbDrone.Core.Test/Profiles/ProfileRepositoryFixture.cs
index 1c754c0c7..6177749da 100644
--- a/src/NzbDrone.Core.Test/Profiles/ProfileRepositoryFixture.cs
+++ b/src/NzbDrone.Core.Test/Profiles/ProfileRepositoryFixture.cs
@@ -15,7 +15,7 @@ namespace NzbDrone.Core.Test.Profiles
             var profile = new Profile
                 {
                     Items = Qualities.QualityFixture.GetDefaultQualities(Quality.MP3_320, Quality.MP3_192, Quality.MP3_256),
-                    Cutoff = Quality.MP3_320,
+                    Cutoff = Quality.MP3_320.Id,
                     Name = "TestProfile"
                 };
 
diff --git a/src/NzbDrone.Core.Test/Profiles/Qualities/QualityIndexCompareToFixture.cs b/src/NzbDrone.Core.Test/Profiles/Qualities/QualityIndexCompareToFixture.cs
new file mode 100644
index 000000000..b11c046d5
--- /dev/null
+++ b/src/NzbDrone.Core.Test/Profiles/Qualities/QualityIndexCompareToFixture.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Profiles.Qualities;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Qualities
+{
+    [TestFixture]
+    public class QualityIndexCompareToFixture : CoreTest
+    {
+        [TestCase(1, 0, 1, 0, 0)]
+        [TestCase(1, 1, 1, 0, 1)]
+        [TestCase(2, 0, 1, 0, 1)]
+        [TestCase(1, 0, 1, 1, -1)]
+        [TestCase(1, 0, 2, 0, -1)]
+        public void should_match_expected_when_respect_group_order_is_true(int leftIndex, int leftGroupIndex, int rightIndex, int rightGroupIndex, int expected)
+        {
+            var left = new QualityIndex(leftIndex, leftGroupIndex);
+            var right = new QualityIndex(rightIndex, rightGroupIndex);
+            left.CompareTo(right, true).Should().Be(expected);
+        }
+
+        [TestCase(1, 0, 1, 0, 0)]
+        [TestCase(1, 1, 1, 0, 0)]
+        [TestCase(2, 0, 1, 0, 1)]
+        [TestCase(1, 0, 1, 1, 0)]
+        [TestCase(1, 0, 2, 0, -1)]
+        public void should_match_expected_when_respect_group_order_is_false(int leftIndex, int leftGroupIndex, int rightIndex, int rightGroupIndex, int expected)
+        {
+            var left = new QualityIndex(leftIndex, leftGroupIndex);
+            var right = new QualityIndex(rightIndex, rightGroupIndex);
+            left.CompareTo(right, false).Should().Be(expected);
+        }
+    }
+}
diff --git a/src/NzbDrone.Core.Test/Qualities/QualityModelComparerFixture.cs b/src/NzbDrone.Core.Test/Qualities/QualityModelComparerFixture.cs
index 49a728375..82a2771c8 100644
--- a/src/NzbDrone.Core.Test/Qualities/QualityModelComparerFixture.cs
+++ b/src/NzbDrone.Core.Test/Qualities/QualityModelComparerFixture.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Profiles.Qualities;
@@ -21,6 +22,46 @@ namespace NzbDrone.Core.Test.Qualities
             Subject = new QualityModelComparer(new Profile { Items = QualityFixture.GetDefaultQualities(Quality.MP3_320, Quality.MP3_192) });
         }
 
+        private void GivenGroupedProfile()
+        {
+            var profile = new Profile
+            {
+                Items = new List<ProfileQualityItem>
+                                      {
+                                          new ProfileQualityItem
+                                          {
+                                              Allowed = false,
+                                              Quality = Quality.MP3_192
+                                          },
+                                          new ProfileQualityItem
+                                          {
+                                              Allowed = true,
+                                              Items = new List<ProfileQualityItem>
+                                                      {
+                                                          new ProfileQualityItem
+                                                          {
+                                                              Allowed = true,
+                                                              Quality = Quality.MP3_320
+                                                          },
+                                                          new ProfileQualityItem
+                                                          {
+                                                              Allowed = true,
+                                                              Quality = Quality.MP3_512
+                                                          }
+                                                      }
+                                          },
+                                          new ProfileQualityItem
+                                          {
+                                              Allowed = true,
+                                              Quality = Quality.FLAC
+                                          }
+                                      }
+            };
+
+            Subject = new QualityModelComparer(profile);
+        }
+
+
         [Test]
         public void should_be_greater_when_first_quality_is_greater_than_second()
         {
@@ -72,5 +113,31 @@ namespace NzbDrone.Core.Test.Qualities
 
             compare.Should().BeGreaterThan(0);
         }
+
+        [Test]
+        public void should_ignore_group_order_by_default()
+        {
+            GivenGroupedProfile();
+
+            var first = new QualityModel(Quality.MP3_320);
+            var second = new QualityModel(Quality.MP3_512);
+
+            var compare = Subject.Compare(first, second);
+
+            compare.Should().Be(0);
+        }
+
+        [Test]
+        public void should_respect_group_order()
+        {
+            GivenGroupedProfile();
+
+            var first = new QualityModel(Quality.MP3_320);
+            var second = new QualityModel(Quality.MP3_512);
+
+            var compare = Subject.Compare(first, second, true);
+
+            compare.Should().BeLessThan(0);
+        }
     }
 }
diff --git a/src/NzbDrone.Core/Datastore/Migration/003_add_medium_support.cs b/src/NzbDrone.Core/Datastore/Migration/003_add_medium_support.cs
new file mode 100644
index 000000000..aed0dab79
--- /dev/null
+++ b/src/NzbDrone.Core/Datastore/Migration/003_add_medium_support.cs
@@ -0,0 +1,22 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(3)]
+    public class add_medium_support : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Alter.Table("Albums").AddColumn("Media").AsString().WithDefaultValue("");
+            Alter.Table("Tracks").AddColumn("MediumNumber").AsInt32().WithDefaultValue(0);
+            Alter.Table("Tracks").AddColumn("AbsoluteTrackNumber").AsInt32().WithDefaultValue(0);
+
+            Execute.Sql("UPDATE Tracks SET AbsoluteTrackNumber = TrackNumber");
+            
+            Delete.Column("TrackNumber").FromTable("Tracks");
+            Alter.Table("Tracks").AddColumn("TrackNumber").AsString().Nullable();
+            
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Datastore/TableMapping.cs b/src/NzbDrone.Core/Datastore/TableMapping.cs
index 9d04ba326..8b748af8d 100644
--- a/src/NzbDrone.Core/Datastore/TableMapping.cs
+++ b/src/NzbDrone.Core/Datastore/TableMapping.cs
@@ -98,6 +98,7 @@ namespace NzbDrone.Core.Datastore
                   .HasOne(track => track.TrackFile, track => track.TrackFileId); // TODO: Check lazy load for artists
 
             Mapper.Entity<QualityDefinition>().RegisterModel("QualityDefinitions")
+                  .Ignore(d => d.GroupName)
                   .Ignore(d => d.Weight);
 
             Mapper.Entity<Profile>().RegisterModel("Profiles");
diff --git a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs
index 1410dfcc7..19d7f6c85 100644
--- a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs
+++ b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs
@@ -56,7 +56,7 @@ namespace NzbDrone.Core.DecisionEngine
 
         private int CompareQuality(DownloadDecision x, DownloadDecision y)
         {
-            return CompareAll(CompareBy(x.RemoteAlbum, y.RemoteAlbum, remoteAlbum => remoteAlbum.Artist.Profile.Value.Items.FindIndex(v => v.Quality == remoteAlbum.ParsedAlbumInfo.Quality.Quality)),
+            return CompareAll(CompareBy(x.RemoteAlbum, y.RemoteAlbum, remoteAlbum => remoteAlbum.Artist.Profile.Value.GetIndex(remoteAlbum.ParsedAlbumInfo.Quality.Quality)),
                            CompareBy(x.RemoteAlbum, y.RemoteAlbum, remoteAlbum => remoteAlbum.ParsedAlbumInfo.Quality.Revision.Real),
                            CompareBy(x.RemoteAlbum, y.RemoteAlbum, remoteAlbum => remoteAlbum.ParsedAlbumInfo.Quality.Revision.Version));
         }
diff --git a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs
index c7aea4b34..eda5bd493 100644
--- a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs
+++ b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs
@@ -64,15 +64,20 @@ namespace NzbDrone.Core.DecisionEngine
 
                     if (parsedAlbumInfo != null)
                     {
-                        if (!report.Artist.IsNullOrWhiteSpace())
-                        {
-                            parsedAlbumInfo.ArtistName = report.Artist;
-                        }
-
-                        if (!report.Album.IsNullOrWhiteSpace())
-                        {
-                            parsedAlbumInfo.AlbumTitle = report.Album;
-                        }
+                        // TODO: Artist Data Augment without calling to parse title again
+                        //if (!report.Artist.IsNullOrWhiteSpace())
+                        //{
+                        //    if (parsedAlbumInfo.ArtistName.IsNullOrWhiteSpace() || _parsingService.GetArtist(parsedAlbumInfo.ArtistName) == null)
+                        //    {
+                        //        parsedAlbumInfo.ArtistName = report.Artist;
+                        //    }
+                        //}
+
+                        // TODO: Replace Parsed AlbumTitle with metadata Title if Parsed AlbumTitle not a valid match
+                        //if (!report.Album.IsNullOrWhiteSpace())
+                        //{
+                        //    parsedAlbumInfo.AlbumTitle = report.Album;
+                        //}
 
                         if (!parsedAlbumInfo.ArtistName.IsNullOrWhiteSpace())
                         {
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs
index 1801235fc..3e5feb73d 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs
@@ -26,6 +26,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
         public virtual Decision IsSatisfiedBy(RemoteAlbum subject, SearchCriteriaBase searchCriteria)
         {
 
+            var profile = subject.Artist.Profile.Value;
+
             foreach (var album in subject.Albums)
             {
                 var trackFiles = _mediaFileService.GetFilesByAlbum(album.ArtistId, album.Id);
@@ -36,14 +38,17 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 
                     _logger.Debug("Comparing file quality and language with report. Existing file is {0}", lowestQuality.Quality);
 
-                    if (!_upgradableSpecification.CutoffNotMet(subject.Artist.Profile,
+                    if (!_upgradableSpecification.CutoffNotMet(profile,
                                                                subject.Artist.LanguageProfile,
                                                                lowestQuality,
                                                                trackFiles[0].Language,
                                                                subject.ParsedAlbumInfo.Quality))
                     {
                         _logger.Debug("Cutoff already met, rejecting.");
-                        return Decision.Reject("Existing file meets cutoff: {0}", subject.Artist.Profile.Value.Cutoff);
+                        var qualityCutoffIndex = profile.GetIndex(profile.Cutoff);
+                        var qualityCutoff = profile.Items[qualityCutoffIndex.Index];
+
+                        return Decision.Reject("Existing file meets cutoff: {0} - {1}", qualityCutoff, subject.Artist.LanguageProfile.Value.Cutoff);
                     }
 
                 }
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/QualityAllowedByProfileSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/QualityAllowedByProfileSpecification.cs
index a02ee49e2..a6ea5f207 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/QualityAllowedByProfileSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/QualityAllowedByProfileSpecification.cs
@@ -1,3 +1,4 @@
+using System;
 using NLog;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
@@ -19,7 +20,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
         public virtual Decision IsSatisfiedBy(RemoteAlbum subject, SearchCriteriaBase searchCriteria)
         {
             _logger.Debug("Checking if report meets quality requirements. {0}", subject.ParsedAlbumInfo.Quality);
-            if (!subject.Artist.Profile.Value.Items.Exists(v => v.Allowed && v.Quality == subject.ParsedAlbumInfo.Quality.Quality))
+
+            var profile = subject.Artist.Profile.Value;
+            var qualityIndex = profile.GetIndex(subject.ParsedAlbumInfo.Quality.Quality);
+            var qualityOrGroup = profile.Items[qualityIndex.Index];
+
+            if (!qualityOrGroup.Allowed)
             {
                 _logger.Debug("Quality {0} rejected by Artist's quality profile", subject.ParsedAlbumInfo.Quality);
                 return Decision.Reject("{0} is not wanted in profile", subject.ParsedAlbumInfo.Quality.Quality);
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs
index 0627459df..8c341dc59 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs
@@ -82,8 +82,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
             }
 
             // If quality meets or exceeds the best allowed quality in the profile accept it immediately
-            var bestQualityInProfile = new QualityModel(profile.LastAllowedQuality());
-            var isBestInProfile = comparer.Compare(subject.ParsedAlbumInfo.Quality, bestQualityInProfile) >= 0;
+            var bestQualityInProfile = profile.LastAllowedQuality();
+            var isBestInProfile = comparer.Compare(subject.ParsedAlbumInfo.Quality.Quality, bestQualityInProfile) >= 0;
             var isBestInProfileLanguage = comparerLanguage.Compare(subject.ParsedAlbumInfo.Language, languageProfile.LastAllowedLanguage()) >= 0;
 
             if (isBestInProfile && isBestInProfileLanguage && isPreferredProtocol)
diff --git a/src/NzbDrone.Core/DecisionEngine/UpgradableSpecification.cs b/src/NzbDrone.Core/DecisionEngine/UpgradableSpecification.cs
index 3c0cebf0d..cd6d9d3e9 100644
--- a/src/NzbDrone.Core/DecisionEngine/UpgradableSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/UpgradableSpecification.cs
@@ -1,4 +1,4 @@
-using NLog;
+using NLog;
 using NzbDrone.Core.Languages;
 using NzbDrone.Core.Profiles.Languages;
 using NzbDrone.Core.Profiles.Qualities;
@@ -51,9 +51,9 @@ namespace NzbDrone.Core.DecisionEngine
 
 
         public bool IsUpgradable(Profile profile, LanguageProfile languageProfile, QualityModel currentQuality, Language currentLanguage, QualityModel newQuality, Language newLanguage)
-        {          
+        {
             // If qualities are the same then check language
-            if (newQuality != null && currentQuality == newQuality)
+            if (newQuality != null && new QualityModelComparer(profile).Compare(newQuality, currentQuality) == 0)
             {
                 return IsLanguageUpgradable(languageProfile, currentLanguage, newLanguage);
             }
@@ -71,7 +71,7 @@ namespace NzbDrone.Core.DecisionEngine
         public bool CutoffNotMet(Profile profile, LanguageProfile languageProfile, QualityModel currentQuality, Language currentLanguage, QualityModel newQuality = null)
         {
             var languageCompare = new LanguageComparer(languageProfile).Compare(currentLanguage, languageProfile.Cutoff);
-            var qualityCompare = new QualityModelComparer(profile).Compare(currentQuality.Quality, profile.Cutoff);
+            var qualityCompare = new QualityModelComparer(profile).Compare(currentQuality.Quality.Id, profile.Cutoff);
 
             // If we can upgrade the language (it is not the cutoff) then doesn't matter the quality we can always get same quality with prefered language
             if (languageCompare < 0)
@@ -97,6 +97,7 @@ namespace NzbDrone.Core.DecisionEngine
         {
             var compare = newQuality.Revision.CompareTo(currentQuality.Revision);
 
+            // Comparing the quality directly because we don't want to upgrade to a proper for a webrip from a webdl or vice versa
             if (currentQuality.Quality == newQuality.Quality && compare > 0)
             {
                 _logger.Debug("New quality is a better revision for existing quality");
diff --git a/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadata.cs b/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadata.cs
index 78505cd39..25f1c236a 100644
--- a/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadata.cs
+++ b/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadata.cs
@@ -149,7 +149,7 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Wdtv
                     details.Add(new XElement("title", string.Format("{0} - {1} - {2}", artist.Name, track.TrackNumber, track.Title)));
                     details.Add(new XElement("artist_name", artist.Name));
                     details.Add(new XElement("track_name", track.Title));
-                    details.Add(new XElement("track_number", track.TrackNumber.ToString("00")));
+                    details.Add(new XElement("track_number", track.AbsoluteTrackNumber.ToString("00")));
                     details.Add(new XElement("genre", string.Join(" / ", artist.Genres)));
                     details.Add(new XElement("member", string.Join(" / ", artist.Members.ConvertAll(c => c.Name + " - " + c.Instrument))));
 
diff --git a/src/NzbDrone.Core/History/HistoryRepository.cs b/src/NzbDrone.Core/History/HistoryRepository.cs
index 9cc0049bf..157e91e6a 100644
--- a/src/NzbDrone.Core/History/HistoryRepository.cs
+++ b/src/NzbDrone.Core/History/HistoryRepository.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Marr.Data.QGen;
@@ -15,6 +16,8 @@ namespace NzbDrone.Core.History
         List<History> FindByDownloadId(string downloadId);
         List<History> FindDownloadHistory(int idArtistId, QualityModel quality);
         void DeleteForArtist(int artistId);
+        List<History> Since(DateTime date, HistoryEventType? eventType);
+
     }
 
     public class HistoryRepository : BasicRepository<History>, IHistoryRepository
@@ -69,5 +72,19 @@ namespace NzbDrone.Core.History
 
             return base.GetPagedQuery(baseQuery, pagingSpec);
         }
+
+        public List<History> Since(DateTime date, HistoryEventType? eventType)
+        {
+            var query = Query.Where(h => h.Date >= date);
+
+            if (eventType.HasValue)
+            {
+                query.AndWhere(h => h.EventType == eventType);
+            }
+
+            query.OrderBy(h => h.Date);
+
+            return query;
+        }
     }
 }
diff --git a/src/NzbDrone.Core/History/HistoryService.cs b/src/NzbDrone.Core/History/HistoryService.cs
index c9dba532a..a84fa60f4 100644
--- a/src/NzbDrone.Core/History/HistoryService.cs
+++ b/src/NzbDrone.Core/History/HistoryService.cs
@@ -26,6 +26,7 @@ namespace NzbDrone.Core.History
         History Get(int historyId);
         List<History> Find(string downloadId, HistoryEventType eventType);
         List<History> FindByDownloadId(string downloadId);
+        List<History> Since(DateTime date, HistoryEventType? eventType);
     }
 
     public class HistoryService : IHistoryService,
@@ -287,5 +288,10 @@ namespace NzbDrone.Core.History
         {
             _historyRepository.DeleteForArtist(message.Artist.Id);
         }
+
+        public List<History> Since(DateTime date, HistoryEventType? eventType)
+        {
+            return _historyRepository.Since(date, eventType);
+        }
     }
 }
diff --git a/src/NzbDrone.Core/MediaFiles/RenameTrackFileService.cs b/src/NzbDrone.Core/MediaFiles/RenameTrackFileService.cs
index 0a59441e2..e4dff636b 100644
--- a/src/NzbDrone.Core/MediaFiles/RenameTrackFileService.cs
+++ b/src/NzbDrone.Core/MediaFiles/RenameTrackFileService.cs
@@ -103,7 +103,7 @@ namespace NzbDrone.Core.MediaFiles
                     {
                         ArtistId = artist.Id,
                         AlbumId = album.Id,
-                        TrackNumbers = tracksInFile.Select(e => e.TrackNumber).ToList(),
+                        TrackNumbers = tracksInFile.Select(e => e.AbsoluteTrackNumber).ToList(),
                         TrackFileId = file.Id,
                         ExistingPath = file.RelativePath,
                         NewPath = artist.Path.GetRelativePath(newPath)
diff --git a/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs b/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs
index 301ffe40b..a9767e8b8 100644
--- a/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs
+++ b/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs
@@ -1,5 +1,6 @@
 using NLog;
 using NzbDrone.Common.Disk;
+using NzbDrone.Common.Exceptions;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.MediaFiles.Events;
@@ -59,7 +60,7 @@ namespace NzbDrone.Core.MediaFiles.TrackImport
 
             var importResults = new List<ImportResult>();
 
-            foreach (var importDecision in qualifiedImports.OrderBy(e => e.LocalTrack.Tracks.Select(track => track.TrackNumber).MinOrDefault())
+            foreach (var importDecision in qualifiedImports.OrderBy(e => e.LocalTrack.Tracks.Select(track => track.AbsoluteTrackNumber).MinOrDefault())
                                                            .ThenByDescending(e => e.LocalTrack.Size))
             {
                 var localTrack = importDecision.LocalTrack;
diff --git a/src/NzbDrone.Core/MediaFiles/TrackImport/Specifications/UpgradeSpecification.cs b/src/NzbDrone.Core/MediaFiles/TrackImport/Specifications/UpgradeSpecification.cs
index 581e0c72b..05b10dd8d 100644
--- a/src/NzbDrone.Core/MediaFiles/TrackImport/Specifications/UpgradeSpecification.cs
+++ b/src/NzbDrone.Core/MediaFiles/TrackImport/Specifications/UpgradeSpecification.cs
@@ -5,8 +5,6 @@ using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Languages;
-using NzbDrone.Core.Profiles.Qualities;
-using System.Collections.Generic;
 
 namespace NzbDrone.Core.MediaFiles.TrackImport.Specifications
 {
@@ -23,7 +21,6 @@ namespace NzbDrone.Core.MediaFiles.TrackImport.Specifications
         {
             var qualityComparer = new QualityModelComparer(localTrack.Artist.Profile);
             var languageComparer = new LanguageComparer(localTrack.Artist.LanguageProfile);
-            var profile = localTrack.Artist.Profile.Value;
 
             if (localTrack.Tracks.Any(e => e.TrackFileId != 0 &&
                                       languageComparer.Compare(e.TrackFile.Value.Language, localTrack.Language) > 0 &&
diff --git a/src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs b/src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs
index 465370caf..bf060cdd0 100644
--- a/src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs
+++ b/src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using NLog;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.Extensions;
+using NzbDrone.Core.MediaFiles.TrackImport;
 using NzbDrone.Core.Parser.Model;
 
 namespace NzbDrone.Core.MediaFiles
@@ -39,13 +40,22 @@ namespace NzbDrone.Core.MediaFiles
             var existingFiles = localTrack.Tracks
                                             .Where(e => e.TrackFileId > 0)
                                             .Select(e => e.TrackFile.Value)
-                                            .GroupBy(e => e.Id);
+                                            .GroupBy(e => e.Id)
+                                            .ToList();
+
+            var rootFolder = _diskProvider.GetParentFolder(localTrack.Artist.Path);
+
+            // If there are existing track files and the root folder is missing, throw, so the old file isn't left behind during the import process.
+            if (existingFiles.Any() && !_diskProvider.FolderExists(rootFolder))
+            {
+                throw new RootFolderNotFoundException($"Root folder '{rootFolder}' was not found.");
+            }
 
             foreach (var existingFile in existingFiles)
             {
                 var file = existingFile.First();
                 var trackFilePath = Path.Combine(localTrack.Artist.Path, file.RelativePath);
-                var subfolder = _diskProvider.GetParentFolder(localTrack.Artist.Path).GetRelativePath(_diskProvider.GetParentFolder(trackFilePath));
+                var subfolder = rootFolder.GetRelativePath(_diskProvider.GetParentFolder(trackFilePath));
 
                 if (_diskProvider.FileExists(trackFilePath))
                 {
diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/AlbumResource.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/AlbumResource.cs
index 0c701a546..a1a8cd865 100644
--- a/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/AlbumResource.cs
+++ b/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/AlbumResource.cs
@@ -9,19 +9,20 @@ namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
     {
         public AlbumResource()
         {
-            Tracks = new List<TrackResource>();
+            Media = new List<MediumResource>();
         }
-        //public string AlbumType { get; set; } // Might need to make this a separate class
+
         public List<ArtistResource> Artists { get; set; } // Will always be length of 1 unless a compilation
         public string Url { get; set; } // Link to the endpoint api to give full info for this object
         public string Id { get; set; } // This is a unique Album ID. Needed for all future API calls
         public DateTime ReleaseDate { get; set; }
         public List<ImageResource> Images { get; set; }
-        public string Title { get; set; } // In case of a takedown, this may be empty
+        public string Title { get; set; }
         public string Overview { get; set; }
         public List<string> Genres { get; set; }
         public List<string> Label { get; set; }
         public string Type { get; set; }
+        public List<MediumResource> Media { get; set; }
         public List<TrackResource> Tracks { get; set; }
     }
 
diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/MediumResource.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/MediumResource.cs
new file mode 100644
index 000000000..3f7d00ac9
--- /dev/null
+++ b/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/MediumResource.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
+{
+    public class MediumResource
+    {
+        public string Name { get; set; }
+        public string Format { get; set; }
+        public int Position { get; set; }
+    }
+
+
+}
diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/TrackResource.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/TrackResource.cs
index eeb86ba48..d2c7af36e 100644
--- a/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/TrackResource.cs
+++ b/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/TrackResource.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -17,8 +17,10 @@ namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
         public string Href { get; set; }
         public string Id { get; set; }
         public string TrackName { get; set; }
-        public int TrackNumber { get; set; }
+        public string TrackNumber { get; set; }
+        public int TrackPosition { get; set; }
         public bool Explicit { get; set; }
+        public int MediumNumber { get; set; }
         public List<ArtistResource> Artists { get; set; }
 
     }
diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
index 4eb93c459..38686603e 100644
--- a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
+++ b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
@@ -13,6 +13,7 @@ using Newtonsoft.Json.Linq;
 using NzbDrone.Core.Music;
 using Newtonsoft.Json;
 using NzbDrone.Core.Configuration;
+using System.Text.RegularExpressions;
 
 namespace NzbDrone.Core.MetadataSource.SkyHook
 {
@@ -157,20 +158,33 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
             album.Images = resource.Images.Select(MapImage).ToList();
             album.Label = resource.Label;
 
-            var tracks = resource.Tracks.Select(MapTrack);
-            album.Tracks = tracks.ToList();
+            album.Media = resource.Media.Select(MapMedium).ToList();
+            album.Tracks = resource.Tracks.Select(MapTrack).ToList();
 
 
             return album;
         }
 
+        private static Medium MapMedium(MediumResource resource)
+        {
+            Medium medium = new Medium();
+            medium.Name = resource.Name;
+            medium.Number = resource.Position;
+            medium.Format = resource.Format;
+
+            return medium;
+        }
+
         private static Track MapTrack(TrackResource resource)
         {
             Track track = new Track();
             track.Title = resource.TrackName;
             track.ForeignTrackId = resource.Id;
             track.TrackNumber = resource.TrackNumber;
+            track.AbsoluteTrackNumber = resource.TrackPosition;
             track.Duration = resource.DurationMs;
+            track.MediumNumber = resource.MediumNumber;
+            
             return track;
         }
 
diff --git a/src/NzbDrone.Core/Music/AddArtistService.cs b/src/NzbDrone.Core/Music/AddArtistService.cs
index 5c0eaf04e..7b5df047a 100644
--- a/src/NzbDrone.Core/Music/AddArtistService.cs
+++ b/src/NzbDrone.Core/Music/AddArtistService.cs
@@ -45,7 +45,8 @@ namespace NzbDrone.Core.Music
         {
             Ensure.That(newArtist, () => newArtist).IsNotNull();
 
-            //newArtist = AddSkyhookData(newArtist);
+            // Called for artist creation from API, duplicated call when called from Lidarr. Fix this.
+            newArtist = AddSkyhookData(newArtist);
 
             if (string.IsNullOrWhiteSpace(newArtist.Path))
             {
diff --git a/src/NzbDrone.Core/Music/Album.cs b/src/NzbDrone.Core/Music/Album.cs
index 85b5f4d04..8430feafa 100644
--- a/src/NzbDrone.Core/Music/Album.cs
+++ b/src/NzbDrone.Core/Music/Album.cs
@@ -11,7 +11,9 @@ namespace NzbDrone.Core.Music
     {
         public Album()
         {
+            Genres = new List<string>();
             Images = new List<MediaCover.MediaCover>();
+            Media = new List<Medium>();
         }
 
         public const string RELEASE_DATE_FORMAT = "yyyy-MM-dd";
@@ -30,12 +32,12 @@ namespace NzbDrone.Core.Music
         //public int DiscCount { get; set; }
         public bool Monitored { get; set; }
         public List<MediaCover.MediaCover> Images { get; set; }
-        //public List<Actor> Actors { get; set; } // TODO: These are band members. TODO: Refactor
         public List<string> Genres { get; set; }
+        public List<Medium> Media { get; set; }
         public DateTime? LastInfoSync { get; set; }
         public DateTime? LastDiskSync { get; set; }
         public DateTime Added { get; set; }
-        public String AlbumType { get; set; } // TODO: Turn this into a type similar to Series Type in TV
+        public String AlbumType { get; set; }
         //public string ArtworkUrl { get; set; }
         //public string Explicitness { get; set; }
         public AddArtistOptions AddOptions { get; set; }
diff --git a/src/NzbDrone.Core/Music/AlbumCutoffService.cs b/src/NzbDrone.Core/Music/AlbumCutoffService.cs
index 58eb2cf05..b1ca5d3bc 100644
--- a/src/NzbDrone.Core/Music/AlbumCutoffService.cs
+++ b/src/NzbDrone.Core/Music/AlbumCutoffService.cs
@@ -39,12 +39,12 @@ namespace NzbDrone.Core.Music
             //Get all items less than the cutoff
             foreach (var profile in profiles)
             {
-                var cutoffIndex = profile.Items.FindIndex(v => v.Quality == profile.Cutoff);
-                var belowCutoff = profile.Items.Take(cutoffIndex).ToList();
+                var cutoffIndex = profile.GetIndex(profile.Cutoff);
+                var belowCutoff = profile.Items.Take(cutoffIndex.Index).ToList();
 
                 if (belowCutoff.Any())
                 {
-                    qualitiesBelowCutoff.Add(new QualitiesBelowCutoff(profile.Id, belowCutoff.Select(i => i.Quality.Id)));
+                    qualitiesBelowCutoff.Add(new QualitiesBelowCutoff(profile.Id, belowCutoff.SelectMany(i => i.GetQualities().Select(q => q.Id))));
                 }
             }
 
diff --git a/src/NzbDrone.Core/Music/AlbumService.cs b/src/NzbDrone.Core/Music/AlbumService.cs
index 0e233968d..8bc71f8d8 100644
--- a/src/NzbDrone.Core/Music/AlbumService.cs
+++ b/src/NzbDrone.Core/Music/AlbumService.cs
@@ -15,7 +15,7 @@ namespace NzbDrone.Core.Music
 {
     public interface IAlbumService
     {
-        Album GetAlbum(int albumid);
+        Album GetAlbum(int albumId);
         List<Album> GetAlbums(IEnumerable<int> albumIds);
         List<Album> GetAlbumsByArtist(int artistId);
         Album AddAlbum(Album newAlbum);
diff --git a/src/NzbDrone.Core/Music/Medium.cs b/src/NzbDrone.Core/Music/Medium.cs
new file mode 100644
index 000000000..02ada9896
--- /dev/null
+++ b/src/NzbDrone.Core/Music/Medium.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using NzbDrone.Core.Datastore;
+
+namespace NzbDrone.Core.Music
+{
+    public class Medium : IEmbeddedDocument
+    {
+        public int Number { get; set; }
+        public string Name { get; set; }
+        public string Format { get; set; }
+    }
+}
diff --git a/src/NzbDrone.Core/Music/RefreshAlbumService.cs b/src/NzbDrone.Core/Music/RefreshAlbumService.cs
index d9c6a349e..bffdce47a 100644
--- a/src/NzbDrone.Core/Music/RefreshAlbumService.cs
+++ b/src/NzbDrone.Core/Music/RefreshAlbumService.cs
@@ -80,6 +80,7 @@ namespace NzbDrone.Core.Music
                     albumToUpdate.ArtistId = artist.Id;
                     albumToUpdate.AlbumType = album.AlbumType;
                     albumToUpdate.Genres = album.Genres;
+                    albumToUpdate.Media = album.Media;
                     albumToUpdate.Label = album.Label;
                     albumToUpdate.Images = album.Images;
                     albumToUpdate.ReleaseDate = album.ReleaseDate;
diff --git a/src/NzbDrone.Core/Music/RefreshTrackService.cs b/src/NzbDrone.Core/Music/RefreshTrackService.cs
index 6e024c880..12c1d19e7 100644
--- a/src/NzbDrone.Core/Music/RefreshTrackService.cs
+++ b/src/NzbDrone.Core/Music/RefreshTrackService.cs
@@ -65,6 +65,7 @@ namespace NzbDrone.Core.Music
                     // TODO: Use object mapper to automatically handle this
                     trackToUpdate.ForeignTrackId = track.ForeignTrackId;
                     trackToUpdate.TrackNumber = track.TrackNumber;
+                    trackToUpdate.AbsoluteTrackNumber = track.AbsoluteTrackNumber;
                     trackToUpdate.Title = track.Title ?? "Unknown";
                     trackToUpdate.AlbumId = album.Id;
                     trackToUpdate.Album = track.Album ?? album;
@@ -72,6 +73,7 @@ namespace NzbDrone.Core.Music
                     trackToUpdate.ArtistId = album.ArtistId;
                     trackToUpdate.Compilation = track.Compilation;
                     trackToUpdate.Duration = track.Duration;
+                    trackToUpdate.MediumNumber = track.MediumNumber;
 
 
                     successCount++;
@@ -110,7 +112,7 @@ namespace NzbDrone.Core.Music
 
         private bool GetMonitoredStatus(Track track, IEnumerable<Album> albums)
         {
-            if (track.TrackNumber == 0 /*&& track.AlbumId != 1*/)
+            if (track.AbsoluteTrackNumber == 0 /*&& track.AlbumId != 1*/)
             {
                 return false;
             }
diff --git a/src/NzbDrone.Core/Music/Track.cs b/src/NzbDrone.Core/Music/Track.cs
index 26c31dfdc..f7df68377 100644
--- a/src/NzbDrone.Core/Music/Track.cs
+++ b/src/NzbDrone.Core/Music/Track.cs
@@ -1,4 +1,4 @@
-using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Datastore;
 using NzbDrone.Core.MediaFiles;
 using Marr.Data;
 using System;
@@ -24,7 +24,8 @@ namespace NzbDrone.Core.Music
         public int ArtistId { get; set; } // This is the DB Id of the Artist, not the SpotifyId
         //public int CompilationId { get; set; }
         public bool Compilation { get; set; }
-        public int TrackNumber { get; set; }
+        public string TrackNumber { get; set; }
+        public int AbsoluteTrackNumber { get; set; }
         public string Title { get; set; }
         public int Duration { get; set; }
         //public bool Ignored { get; set; }
@@ -32,6 +33,7 @@ namespace NzbDrone.Core.Music
         public bool Monitored { get; set; }
         public int TrackFileId { get; set; } 
         public Ratings Ratings { get; set; }
+        public int MediumNumber { get; set; }
         //public DateTime? ReleaseDate { get; set; }
 
         public LazyLoaded<TrackFile> TrackFile { get; set; }
diff --git a/src/NzbDrone.Core/Music/TrackRepository.cs b/src/NzbDrone.Core/Music/TrackRepository.cs
index 408c01598..7872708fc 100644
--- a/src/NzbDrone.Core/Music/TrackRepository.cs
+++ b/src/NzbDrone.Core/Music/TrackRepository.cs
@@ -13,9 +13,10 @@ namespace NzbDrone.Core.Music
 {
     public interface ITrackRepository : IBasicRepository<Track>
     {
-        Track Find(int artistId, int albumId, int trackNumber);
+        Track Find(int artistId, int albumId, int mediumNumber, int trackNumber);
         List<Track> GetTracks(int artistId);
         List<Track> GetTracksByAlbum(int albumId);
+        List<Track> GetTracksByMedium(int albumId, int mediumNumber);
         List<Track> GetTracksByFileId(int fileId);
         List<Track> TracksWithFiles(int artistId);
         PagingSpec<Track> TracksWithoutFiles(PagingSpec<Track> pagingSpec);
@@ -37,11 +38,12 @@ namespace NzbDrone.Core.Music
             _logger = logger;
         }
 
-        public Track Find(int artistId, int albumId, int trackNumber)
+        public Track Find(int artistId, int albumId, int mediumNumber, int trackNumber)
         {
             return Query.Where(s => s.ArtistId == artistId)
                                .AndWhere(s => s.AlbumId == albumId)
-                               .AndWhere(s => s.TrackNumber == trackNumber)
+                               .AndWhere(s => s.MediumNumber == mediumNumber)
+                               .AndWhere(s => s.AbsoluteTrackNumber == trackNumber)
                                .SingleOrDefault();
         }
 
@@ -57,6 +59,13 @@ namespace NzbDrone.Core.Music
                         .ToList();
         }
 
+        public List<Track> GetTracksByMedium(int albumId, int mediumNumber)
+        {
+            return Query.Where(s => s.AlbumId == albumId)
+                        .AndWhere(s => s.MediumNumber == mediumNumber)
+                        .ToList();
+        }
+
         public List<Track> GetTracksByFileId(int fileId)
         {
             return Query.Where(e => e.TrackFileId == fileId).ToList();
diff --git a/src/NzbDrone.Core/Music/TrackService.cs b/src/NzbDrone.Core/Music/TrackService.cs
index d58eb6fbf..184bb68dc 100644
--- a/src/NzbDrone.Core/Music/TrackService.cs
+++ b/src/NzbDrone.Core/Music/TrackService.cs
@@ -16,8 +16,8 @@ namespace NzbDrone.Core.Music
     {
         Track GetTrack(int id);
         List<Track> GetTracks(IEnumerable<int> ids);
-        Track FindTrack(int artistId, int albumId, int trackNumber);
-        Track FindTrackByTitle(int artistId, int albumId, string releaseTitle);
+        Track FindTrack(int artistId, int albumId, int mediumNumber, int trackNumber);
+        Track FindTrackByTitle(int artistId, int albumId, int mediumNumber, string releaseTitle);
         List<Track> GetTracksByArtist(int artistId);
         List<Track> GetTracksByAlbum(int albumId);
         //List<Track> GetTracksByAlbumTitle(string artistId, string albumTitle);
@@ -59,9 +59,9 @@ namespace NzbDrone.Core.Music
             return _trackRepository.Get(ids).ToList();
         }
 
-        public Track FindTrack(int artistId, int albumId, int trackNumber)
+        public Track FindTrack(int artistId, int albumId, int mediumNumber, int trackNumber)
         {
-            return _trackRepository.Find(artistId, albumId, trackNumber);
+            return _trackRepository.Find(artistId, albumId, mediumNumber, trackNumber);
         }
 
         public List<Track> GetTracksByArtist(int artistId)
@@ -75,11 +75,11 @@ namespace NzbDrone.Core.Music
             return _trackRepository.GetTracksByAlbum(albumId);
         }
 
-        public Track FindTrackByTitle(int artistId, int albumId, string releaseTitle)
+        public Track FindTrackByTitle(int artistId, int albumId, int mediumNumber, string releaseTitle)
         {
             // TODO: can replace this search mechanism with something smarter/faster/better
             var normalizedReleaseTitle = Parser.Parser.NormalizeEpisodeTitle(releaseTitle).Replace(".", " ");
-            var tracks = _trackRepository.GetTracksByAlbum(albumId);
+            var tracks = _trackRepository.GetTracksByMedium(albumId, mediumNumber);
 
             var matches = tracks.Select(
                 track => new
diff --git a/src/NzbDrone.Core/Notifications/Webhook/WebhookTrack.cs b/src/NzbDrone.Core/Notifications/Webhook/WebhookTrack.cs
index 3d03fda2c..098fd0078 100644
--- a/src/NzbDrone.Core/Notifications/Webhook/WebhookTrack.cs
+++ b/src/NzbDrone.Core/Notifications/Webhook/WebhookTrack.cs
@@ -17,7 +17,7 @@ namespace NzbDrone.Core.Notifications.Webhook
 
         public int Id { get; set; }
         public string Title { get; set; }
-        public int TrackNumber { get; set; }
+        public string TrackNumber { get; set; }
 
         public string Quality { get; set; }
         public int QualityVersion { get; set; }
diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj
index 3814522ef..7ec81e99a 100644
--- a/src/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/src/NzbDrone.Core/NzbDrone.Core.csproj
@@ -172,6 +172,7 @@
     <Compile Include="Datastore\LogDatabase.cs" />
     <Compile Include="Datastore\Migration\001_initial_setup.cs" />
     <Compile Include="Datastore\Migration\002_add_reason_to_pending_releases.cs" />
+    <Compile Include="Datastore\Migration\003_add_medium_support.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationContext.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationController.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationDbFactory.cs" />
@@ -710,6 +711,7 @@
     <Compile Include="Messaging\IProcessMessage.cs" />
     <Compile Include="MetadataSource\IProvideArtistInfo.cs" />
     <Compile Include="MetadataSource\ISearchForNewArtist.cs" />
+    <Compile Include="MetadataSource\SkyHook\Resource\MediumResource.cs" />
     <Compile Include="MetadataSource\SkyHook\Resource\MemberResource.cs" />
     <Compile Include="MetadataSource\SkyHook\Resource\AlbumResource.cs" />
     <Compile Include="MetadataSource\SkyHook\Resource\ArtistResource.cs" />
@@ -745,6 +747,7 @@
     <Compile Include="Music\Links.cs" />
     <Compile Include="Music\Commands\MoveArtistCommand.cs" />
     <Compile Include="Music\Events\ArtistMovedEvent.cs" />
+    <Compile Include="Music\Medium.cs" />
     <Compile Include="Music\MonitoringOptions.cs" />
     <Compile Include="Music\AlbumMonitoredService.cs" />
     <Compile Include="Music\MoveArtistService.cs" />
@@ -860,6 +863,7 @@
     <Compile Include="Profiles\Languages\LanguageProfileService.cs" />
     <Compile Include="Profiles\Languages\ProfileLanguageItem.cs" />
     <Compile Include="Profiles\Quality\ProfileRepository.cs" />
+    <Compile Include="Profiles\Quality\QualityIndex.cs" />
     <Compile Include="ProgressMessaging\ProgressMessageContext.cs" />
     <Compile Include="Qualities\QualitySource.cs" />
     <Compile Include="Qualities\Revision.cs" />
diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index b834726e8..daffbe758 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -39,6 +39,9 @@ namespace NzbDrone.Core.Organizer
         private static readonly Regex TrackRegex = new Regex(@"(?<track>\{track(?:\:0+)?})",
                                                                RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
+        private static readonly Regex MediumRegex = new Regex(@"(?<medium>\{medium(?:\:0+)?})",
+                                                               RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
         private static readonly Regex AbsoluteEpisodeRegex = new Regex(@"(?<absolute>\{absolute(?:\:0+)?})",
                                                                RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
@@ -107,10 +110,11 @@ namespace NzbDrone.Core.Organizer
             tracks = tracks.OrderBy(e => e.AlbumId).ThenBy(e => e.TrackNumber).ToList();
 
             pattern = FormatTrackNumberTokens(pattern, "", tracks);
-            //pattern = AddAbsoluteNumberingTokens(pattern, tokenHandlers, series, episodes, namingConfig);
+            pattern = FormatMediumNumberTokens(pattern, "", tracks);
 
             AddArtistTokens(tokenHandlers, artist);
             AddAlbumTokens(tokenHandlers, album);
+            AddMediumTokens(tokenHandlers, album.Media.SingleOrDefault(m => m.Number == tracks.First().MediumNumber));
             AddTrackTokens(tokenHandlers, tracks);
             AddTrackFileTokens(tokenHandlers, trackFile);
             AddQualityTokens(tokenHandlers, artist, trackFile);
@@ -280,6 +284,11 @@ namespace NzbDrone.Core.Organizer
             }
         }
 
+        private void AddMediumTokens(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, Medium medium)
+        {
+            tokenHandlers["{Medium Format}"] = m => medium.Format;
+        }
+
         private void AddTrackTokens(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, List<Track> tracks)
         {
             tokenHandlers["{Track Title}"] = m => GetTrackTitle(tracks, "+");
@@ -431,7 +440,21 @@ namespace NzbDrone.Core.Organizer
             {
                 var patternToReplace = i == 0 ? basePattern : formatPattern;
 
-                pattern += TrackRegex.Replace(patternToReplace, match => ReplaceNumberToken(match.Groups["track"].Value, tracks[i].TrackNumber));
+                pattern += TrackRegex.Replace(patternToReplace, match => ReplaceNumberToken(match.Groups["track"].Value, tracks[i].AbsoluteTrackNumber));
+            }
+
+            return pattern;
+        }
+
+        private string FormatMediumNumberTokens(string basePattern, string formatPattern, List<Track> tracks)
+        {
+            var pattern = string.Empty;
+
+            for (int i = 0; i < tracks.Count; i++)
+            {
+                var patternToReplace = i == 0 ? basePattern : formatPattern;
+
+                pattern += MediumRegex.Replace(patternToReplace, match => ReplaceNumberToken(match.Groups["medium"].Value, tracks[i].MediumNumber));
             }
 
             return pattern;
diff --git a/src/NzbDrone.Core/Organizer/FileNameSampleService.cs b/src/NzbDrone.Core/Organizer/FileNameSampleService.cs
index 13dc05942..430a777e1 100644
--- a/src/NzbDrone.Core/Organizer/FileNameSampleService.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameSampleService.cs
@@ -36,12 +36,22 @@ namespace NzbDrone.Core.Organizer
             _standardAlbum = new Album
             {
                 Title = "The Album Title",
-                ReleaseDate = System.DateTime.Today
+                ReleaseDate = System.DateTime.Today,
+                Media = new List<Medium>
+                {
+                    new Medium
+                    {
+                        Name = "CD 1: First Years",
+                        Format = "CD",
+                        Number = 1
+                    }
+                }
             };
 
             _track1 = new Track
             {
-                TrackNumber = 3,
+                AbsoluteTrackNumber = 3,
+                MediumNumber = 1,
                 
                 Title = "Track Title (1)",
                 
diff --git a/src/NzbDrone.Core/Parser/Model/ParsedAlbumInfo.cs b/src/NzbDrone.Core/Parser/Model/ParsedAlbumInfo.cs
index c116bec37..fadf4bbe2 100644
--- a/src/NzbDrone.Core/Parser/Model/ParsedAlbumInfo.cs
+++ b/src/NzbDrone.Core/Parser/Model/ParsedAlbumInfo.cs
@@ -18,6 +18,7 @@ namespace NzbDrone.Core.Parser.Model
         public Language Language { get; set; }
         public string ReleaseGroup { get; set; }
         public string ReleaseHash { get; set; }
+        public string ReleaseVersion { get; set; }
 
         public override string ToString()
         {
diff --git a/src/NzbDrone.Core/Parser/Model/ParsedTrackInfo.cs b/src/NzbDrone.Core/Parser/Model/ParsedTrackInfo.cs
index 60771920c..2d5bf8471 100644
--- a/src/NzbDrone.Core/Parser/Model/ParsedTrackInfo.cs
+++ b/src/NzbDrone.Core/Parser/Model/ParsedTrackInfo.cs
@@ -18,6 +18,7 @@ namespace NzbDrone.Core.Parser.Model
         public string ArtistMBId { get; set; }
         public string AlbumMBId { get; set; }
         public string TrackMBId { get; set; }
+        public int DiscNumber { get; set; }
         public QualityModel Quality { get; set; }
         public int[] TrackNumbers { get; set; }
         public Language Language { get; set; }
diff --git a/src/NzbDrone.Core/Parser/Parser.cs b/src/NzbDrone.Core/Parser/Parser.cs
index 21ebe5e27..8ee766487 100644
--- a/src/NzbDrone.Core/Parser/Parser.cs
+++ b/src/NzbDrone.Core/Parser/Parser.cs
@@ -41,12 +41,22 @@ namespace NzbDrone.Core.Parser
 
         private static readonly Regex[] ReportAlbumTitleRegex = new[]
         {
+                //Artist-Album-Version-Source-Year
+                //ex. Imagine Dragons-Smoke And Mirrors-Deluxe Edition-2CD-FLAC-2015-JLM
+                new Regex(@"^(?<artist>.+?)[-](?<album>.+?)[-](?:[\(|\[]?)(?<version>.+?(?:Edition)?)(?:[\)|\]]?)[-](?<source>\d?CD|WEB).+?(?<releaseyear>\d{4})",
+                    RegexOptions.IgnoreCase | RegexOptions.Compiled),
+
+                //Artist-Album-Source-Year
+                //ex. Dani_Sbert-Togheter-WEB-2017-FURY
+                new Regex(@"^(?<artist>.+?)[-](?<album>.+?)[-](?<source>\d?CD|WEB).+?(?<releaseyear>\d{4})",
+                    RegexOptions.IgnoreCase | RegexOptions.Compiled),
+
                 //Artist - Album (Year) Strict
-                new Regex(@"^(?:(?<artist>.+?)(?: - )+)(?<album>.+?)\W*(?:\(|\[).+?(?<airyear>\d{4})",
+                new Regex(@"^(?:(?<artist>.+?)(?: - )+)(?<album>.+?)\W*(?:\(|\[).+?(?<releaseyear>\d{4})",
                     RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Artist - Album (Year)
-                new Regex(@"^(?:(?<artist>.+?)(?: - )+)(?<album>.+?)\W*(?:\(|\[)(?<airyear>\d{4})",
+                new Regex(@"^(?:(?<artist>.+?)(?: - )+)(?<album>.+?)\W*(?:\(|\[)(?<releaseyear>\d{4})",
                     RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Artist - Album
@@ -62,11 +72,11 @@ namespace NzbDrone.Core.Parser
                     RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                  //Artist - Album (Year) Strict
-                new Regex(@"^(?:(?<artist>.+?)(?:-)+)(?<album>.+?)\W*(?:\(|\[).+?(?<airyear>\d{4})",
+                new Regex(@"^(?:(?<artist>.+?)(?:-)+)(?<album>.+?)\W*(?:\(|\[).+?(?<releaseyear>\d{4})",
                     RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Artist - Album (Year)
-                new Regex(@"^(?:(?<artist>.+?)(?:-)+)(?<album>.+?)\W*(?:\(|\[)(?<airyear>\d{4})",
+                new Regex(@"^(?:(?<artist>.+?)(?:-)+)(?<album>.+?)\W*(?:\(|\[)(?<releaseyear>\d{4})",
                     RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Artist - Album
@@ -484,6 +494,7 @@ namespace NzbDrone.Core.Parser
             var file = TagLib.File.Create(path);
             var trackNumber = file.Tag.Track;
             var trackTitle = file.Tag.Title;
+            var discNumber = (file.Tag.Disc > 0) ? Convert.ToInt32(file.Tag.Disc) : 1 ;
 
             var artist = file.Tag.FirstAlbumArtist;
 
@@ -507,6 +518,7 @@ namespace NzbDrone.Core.Parser
                 ArtistTitle = artist,
                 ArtistMBId = file.Tag.MusicBrainzArtistId,
                 AlbumMBId = file.Tag.MusicBrainzReleaseId,
+                DiscNumber = discNumber,
                 TrackMBId = file.Tag.MusicBrainzReleaseType,
                 TrackNumbers = temp,
                 ArtistTitleInfo = artistTitleInfo,
@@ -626,11 +638,13 @@ namespace NzbDrone.Core.Parser
         {
             var artistName = matchCollection[0].Groups["artist"].Value.Replace('.', ' ').Replace('_', ' ');
             var albumTitle = matchCollection[0].Groups["album"].Value.Replace('.', ' ').Replace('_', ' ');
+            var releaseVersion = matchCollection[0].Groups["version"].Value.Replace('.', ' ').Replace('_', ' ');
             artistName = RequestInfoRegex.Replace(artistName, "").Trim(' ');
             albumTitle = RequestInfoRegex.Replace(albumTitle, "").Trim(' ');
+            releaseVersion = RequestInfoRegex.Replace(releaseVersion, "").Trim(' ');
 
-            int airYear;
-            int.TryParse(matchCollection[0].Groups["year"].Value, out airYear);
+            int releaseYear;
+            int.TryParse(matchCollection[0].Groups["releaseyear"].Value, out releaseYear);
 
             ParsedAlbumInfo result;
 
@@ -639,6 +653,8 @@ namespace NzbDrone.Core.Parser
             result.ArtistName = artistName;
             result.AlbumTitle = albumTitle;
             result.ArtistTitleInfo = GetArtistTitleInfo(result.ArtistName);
+            result.ReleaseDate = releaseYear.ToString();
+            result.ReleaseVersion = releaseVersion;
 
             Logger.Debug("Album Parsed. {0}", result);
 
diff --git a/src/NzbDrone.Core/Parser/ParsingService.cs b/src/NzbDrone.Core/Parser/ParsingService.cs
index 3f6972dec..9e23cc287 100644
--- a/src/NzbDrone.Core/Parser/ParsingService.cs
+++ b/src/NzbDrone.Core/Parser/ParsingService.cs
@@ -122,6 +122,7 @@ namespace NzbDrone.Core.Parser
 
             if (albumInfo == null)
             {
+                // TODO: Search by Title and Year instead of just Title when matching
                 albumInfo = _albumService.FindByTitle(artist.Id, parsedAlbumInfo.AlbumTitle);
             }
 
@@ -243,7 +244,7 @@ namespace NzbDrone.Core.Parser
 
             if (parsedTrackInfo.Title.IsNotNullOrWhiteSpace())
             {
-                trackInfo = _trackService.FindTrackByTitle(artist.Id, album.Id, parsedTrackInfo.Title);
+                trackInfo = _trackService.FindTrackByTitle(artist.Id, album.Id, parsedTrackInfo.DiscNumber, parsedTrackInfo.Title);
                 _logger.Debug("Track {0} selected for {1}", trackInfo, parsedTrackInfo);
 
                 if (trackInfo != null)
@@ -265,7 +266,7 @@ namespace NzbDrone.Core.Parser
             {
                 Track trackInfoByNumber = null;
 
-                trackInfoByNumber = _trackService.FindTrack(artist.Id, album.Id, trackNumber);
+                trackInfoByNumber = _trackService.FindTrack(artist.Id, album.Id, parsedTrackInfo.DiscNumber, trackNumber);
                 _logger.Debug("Track {0} selected for {1}", trackInfoByNumber, parsedTrackInfo);
 
                 if (trackInfoByNumber != null)
diff --git a/src/NzbDrone.Core/Profiles/Quality/Profile.cs b/src/NzbDrone.Core/Profiles/Quality/Profile.cs
index d453d83d9..1371a2852 100644
--- a/src/NzbDrone.Core/Profiles/Quality/Profile.cs
+++ b/src/NzbDrone.Core/Profiles/Quality/Profile.cs
@@ -8,12 +8,59 @@ namespace NzbDrone.Core.Profiles.Qualities
     public class Profile : ModelBase
     {
         public string Name { get; set; }
-        public Quality Cutoff { get; set; }
+        public int Cutoff { get; set; }
         public List<ProfileQualityItem> Items { get; set; }
 
         public Quality LastAllowedQuality()
         {
-            return Items.Last(q => q.Allowed).Quality;
+            var lastAllowed = Items.Last(q => q.Allowed);
+
+            if (lastAllowed.Quality != null)
+            {
+                return lastAllowed.Quality;
+            }
+
+            // Returning any item from the group will work,
+            // returning the last because it's the true last quality.
+            return lastAllowed.Items.Last().Quality;
+        }
+
+        public QualityIndex GetIndex(Quality quality)
+        {
+            return GetIndex(quality.Id);
+        }
+
+        public QualityIndex GetIndex(int id)
+        {
+            for (var i = 0; i < Items.Count; i++)
+            {
+                var item = Items[i];
+                var quality = item.Quality;
+
+                // Quality matches by ID
+                if (quality != null && quality.Id == id)
+                {
+                    return new QualityIndex(i);
+                }
+
+                // Group matches by ID
+                if (item.Id > 0 && item.Id == id)
+                {
+                    return new QualityIndex(i);
+                }
+
+                for (var g = 0; g < item.Items.Count; g++)
+                {
+                    var groupItem = item.Items[g];
+
+                    if (groupItem.Quality.Id == id)
+                    {
+                        return new QualityIndex(i, g);
+                    }
+                }
+            }
+
+            return new QualityIndex();
         }
     }
 }
diff --git a/src/NzbDrone.Core/Profiles/Quality/ProfileQualityItem.cs b/src/NzbDrone.Core/Profiles/Quality/ProfileQualityItem.cs
index 338654854..5a7ad1d07 100644
--- a/src/NzbDrone.Core/Profiles/Quality/ProfileQualityItem.cs
+++ b/src/NzbDrone.Core/Profiles/Quality/ProfileQualityItem.cs
@@ -1,3 +1,7 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Qualities;
 
@@ -5,7 +9,39 @@ namespace NzbDrone.Core.Profiles.Qualities
 {
     public class ProfileQualityItem : IEmbeddedDocument
     {
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public int Id { get; set; }
+
+        public string Name { get; set; }
         public Quality Quality { get; set; }
+        public List<ProfileQualityItem> Items { get; set; }
         public bool Allowed { get; set; }
+
+        public ProfileQualityItem()
+        {
+            Items = new List<ProfileQualityItem>();
+        }
+
+        public List<Quality> GetQualities()
+        {
+            if (Quality == null)
+            {
+                return Items.Select(s => s.Quality).ToList();
+            }
+
+            return new List<Quality> { Quality };
+        }
+
+        public override string ToString()
+        {
+            var qualitiesString = string.Join(", ", GetQualities());
+
+            if (Name.IsNotNullOrWhiteSpace())
+            {
+                return $"{Name} ({qualitiesString})";
+            }
+
+            return qualitiesString;
+        }
     }
 }
diff --git a/src/NzbDrone.Core/Profiles/Quality/ProfileService.cs b/src/NzbDrone.Core/Profiles/Quality/ProfileService.cs
index a1be66b2a..05abbee96 100644
--- a/src/NzbDrone.Core/Profiles/Quality/ProfileService.cs
+++ b/src/NzbDrone.Core/Profiles/Quality/ProfileService.cs
@@ -73,7 +73,9 @@ namespace NzbDrone.Core.Profiles.Qualities
                             .Select(v => new ProfileQualityItem { Quality = v.Quality, Allowed = allowed.Contains(v.Quality) })
                             .ToList();
 
-            var profile = new Profile { Name = name, Cutoff = cutoff, Items = items};
+            var profile = new Profile { Name = name,
+                Cutoff = (int)cutoff,
+                Items = items};
 
             return Add(profile);
         }
diff --git a/src/NzbDrone.Core/Profiles/Quality/QualityIndex.cs b/src/NzbDrone.Core/Profiles/Quality/QualityIndex.cs
new file mode 100644
index 000000000..c4adf42a6
--- /dev/null
+++ b/src/NzbDrone.Core/Profiles/Quality/QualityIndex.cs
@@ -0,0 +1,55 @@
+using System;
+
+namespace NzbDrone.Core.Profiles.Qualities
+{
+    public class QualityIndex : IComparable, IComparable<QualityIndex>
+    {
+        public int Index { get; set; }
+        public int GroupIndex { get; set; }
+
+        public QualityIndex()
+        {
+            Index = 0;
+            GroupIndex = 0;
+        }
+
+        public QualityIndex(int index)
+        {
+            Index = index;
+            GroupIndex = 0;
+        }
+
+        public QualityIndex(int index, int groupIndex)
+        {
+            Index = index;
+            GroupIndex = groupIndex;
+        }
+
+        public int CompareTo(object obj)
+        {
+            return CompareTo((QualityIndex)obj, true);
+        }
+
+        public int CompareTo(QualityIndex other)
+        {
+            return CompareTo(other, true);
+        }
+
+        public int CompareTo(QualityIndex right, bool respectGroupOrder)
+        {
+            if (right == null)
+            {
+                return 1;
+            }
+
+            var indexCompare = Index.CompareTo(right.Index);
+
+            if (respectGroupOrder && indexCompare == 0)
+            {
+                return GroupIndex.CompareTo(right.GroupIndex);
+            }
+
+            return indexCompare;
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Qualities/Quality.cs b/src/NzbDrone.Core/Qualities/Quality.cs
index 85ce79b77..e1b19a849 100644
--- a/src/NzbDrone.Core/Qualities/Quality.cs
+++ b/src/NzbDrone.Core/Qualities/Quality.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Core.Datastore;
@@ -129,4 +129,3 @@ namespace NzbDrone.Core.Qualities
         }
     }
 }
- 
\ No newline at end of file
diff --git a/src/NzbDrone.Core/Qualities/QualityDefinition.cs b/src/NzbDrone.Core/Qualities/QualityDefinition.cs
index 372002333..620691d1d 100644
--- a/src/NzbDrone.Core/Qualities/QualityDefinition.cs
+++ b/src/NzbDrone.Core/Qualities/QualityDefinition.cs
@@ -1,4 +1,4 @@
-using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Datastore;
 
 
 namespace NzbDrone.Core.Qualities
@@ -9,6 +9,7 @@ namespace NzbDrone.Core.Qualities
 
         public string Title { get; set; }
 
+        public string GroupName { get; set; }
         public int Weight { get; set; }
 
         public double? MinSize { get; set; }
@@ -30,4 +31,4 @@ namespace NzbDrone.Core.Qualities
             return Quality.Name;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/NzbDrone.Core/Qualities/QualityModelComparer.cs b/src/NzbDrone.Core/Qualities/QualityModelComparer.cs
index 029089030..259335a8f 100644
--- a/src/NzbDrone.Core/Qualities/QualityModelComparer.cs
+++ b/src/NzbDrone.Core/Qualities/QualityModelComparer.cs
@@ -16,17 +16,35 @@ namespace NzbDrone.Core.Qualities
             _profile = profile;
         }
 
+        public int Compare(int left, int right, bool respectGroupOrder = false)
+        {
+            var leftIndex = _profile.GetIndex(left);
+            var rightIndex = _profile.GetIndex(right);
+
+            return leftIndex.CompareTo(rightIndex, respectGroupOrder);
+        }
+
         public int Compare(Quality left, Quality right)
         {
-            int leftIndex = _profile.Items.FindIndex(v => v.Quality == left);
-            int rightIndex = _profile.Items.FindIndex(v => v.Quality == right);
+            return Compare(left, right, false);
+        }
+
+        public int Compare(Quality left, Quality right, bool respectGroupOrder)
+        {
+            var leftIndex = _profile.GetIndex(left);
+            var rightIndex = _profile.GetIndex(right);
 
-            return leftIndex.CompareTo(rightIndex);
+            return leftIndex.CompareTo(rightIndex, respectGroupOrder);
         }
 
         public int Compare(QualityModel left, QualityModel right)
         {
-            int result = Compare(left.Quality, right.Quality);
+            return Compare(left, right, false);
+        }
+
+        public int Compare(QualityModel left, QualityModel right, bool respectGroupOrder)
+        {
+            int result = Compare(left.Quality, right.Quality, respectGroupOrder);
 
             if (result == 0)
             {
diff --git a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs
index c4ac3c900..bff1b2018 100644
--- a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs
+++ b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs
@@ -267,7 +267,7 @@ namespace NzbDrone.Integration.Test
 
         public TrackFileResource EnsureTrackFile(ArtistResource artist, int albumId, int track, Quality quality)
         {
-            var result = Tracks.GetTracksInArtist(artist.Id).Single(v => v.AlbumId == albumId && v.TrackNumber == track);
+            var result = Tracks.GetTracksInArtist(artist.Id).Single(v => v.AlbumId == albumId && v.AbsoluteTrackNumber == track);
 
             if (result.TrackFile == null)
             {
@@ -279,7 +279,7 @@ namespace NzbDrone.Integration.Test
                 Commands.PostAndWait(new CommandResource { Name = "refreshartist", Body = new RefreshArtistCommand(artist.Id) });
                 Commands.WaitAll();
                 
-                result = Tracks.GetTracksInArtist(artist.Id).Single(v => v.AlbumId == albumId && v.TrackNumber == track);
+                result = Tracks.GetTracksInArtist(artist.Id).Single(v => v.AlbumId == albumId && v.AbsoluteTrackNumber == track);
 
                 result.TrackFile.Should().NotBeNull();
             }
@@ -291,9 +291,9 @@ namespace NzbDrone.Integration.Test
         {
             var profile = Profiles.Get(profileId);
 
-            if (profile.Cutoff != cutoff)
+            if (profile.Cutoff != cutoff.Id)
             {
-                profile.Cutoff = cutoff;
+                profile.Cutoff = cutoff.Id;
                 profile = Profiles.Put(profile);
             }
 
diff --git a/yarn.lock b/yarn.lock
index b968e859d..e6b471e9f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5388,10 +5388,6 @@ react-themeable@^1.1.0:
   dependencies:
     object-assign "^3.0.0"
 
-react-truncate@2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/react-truncate/-/react-truncate-2.2.2.tgz#c13e420df82cf6d0385bb2a6eb10212743085550"
-
 react-virtualized@9.10.1:
   version "9.10.1"
   resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.10.1.tgz#d32365d0edf49debbe25fbfe73b5f55f6d9d8c72"