diff --git a/packages/cp-frontend/src/components/deployment-group/delete.js b/packages/cp-frontend/src/components/deployment-group/delete.js
index 843a7466..1911f9d2 100644
--- a/packages/cp-frontend/src/components/deployment-group/delete.js
+++ b/packages/cp-frontend/src/components/deployment-group/delete.js
@@ -1,17 +1,24 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import styled from 'styled-components';
 import { ModalHeading, ModalText, Button } from 'joyent-ui-toolkit';
 
-const DeploymentGroupDelete = ({ deploymentGroup, onCancelClick, onConfirmClick }) =>
+const DeploymentGroupDelete = ({
+  deploymentGroup,
+  onCancelClick,
+  onConfirmClick
+}) =>
   <div>
     <ModalHeading>
       Deleting a deployment group: <br /> {deploymentGroup.name}
     </ModalHeading>
     <ModalText marginBottom="3">
-      Deleting a deployment group will also remove all of the services and instances associated with that deployment group. Are you sure you want to continue?
+      Deleting a deployment group will also remove all of the services and
+      instances associated with that deployment group. Are you sure you want to
+      continue?
     </ModalText>
-    <Button onClick={onCancelClick} secondary>Cancel</Button>
+    <Button onClick={onCancelClick} secondary>
+      Cancel
+    </Button>
     <Button onClick={onConfirmClick}>Delete deployment group</Button>
   </div>;
 
diff --git a/packages/cp-frontend/src/components/instances/list-item.js b/packages/cp-frontend/src/components/instances/list-item.js
index b66b04c0..4e402035 100644
--- a/packages/cp-frontend/src/components/instances/list-item.js
+++ b/packages/cp-frontend/src/components/instances/list-item.js
@@ -109,7 +109,9 @@ const InstanceCard = ({
   <StyledCard collapsed={true} key={instance.uuid}>
     <CardView>
       <CardMeta onClick={toggleCollapsed}>
-        <CardTitle>{instance.name}</CardTitle>
+        <CardTitle>
+          {instance.name}
+        </CardTitle>
         <CardDescription>
           <StatusBadge status={instance.status} />
         </CardDescription>
diff --git a/packages/cp-frontend/src/components/manifest/edit-or-create.js b/packages/cp-frontend/src/components/manifest/edit-or-create.js
index 7ad363df..0c7d15ce 100644
--- a/packages/cp-frontend/src/components/manifest/edit-or-create.js
+++ b/packages/cp-frontend/src/components/manifest/edit-or-create.js
@@ -135,8 +135,12 @@ export const Name = ({ handleSubmit, onCancel, dirty }) =>
       </Col>
     </Row>
     <ButtonsRow>
-      <Button onClick={onCancel} secondary>Cancel</Button>
-      <Button type="submit" disabled={!dirty}>Next</Button>
+      <Button onClick={onCancel} secondary>
+        Cancel
+      </Button>
+      <Button type="submit" disabled={!dirty}>
+        Next
+      </Button>
     </ButtonsRow>
   </form>;
 
@@ -150,7 +154,9 @@ export const Manifest = ({
   <form onSubmit={handleSubmit}>
     <Field name="manifest" defaultValue={defaultValue} component={MEditor} />
     <ButtonsRow>
-      <Button onClick={onCancel} secondary>Cancel</Button>
+      <Button onClick={onCancel} secondary>
+        Cancel
+      </Button>
       <Button
         disabled={!(dirty || !loading || defaultValue.length)}
         type="submit"
@@ -213,8 +219,12 @@ export const Environment = ({
     <Field name="environment" defaultValue={defaultValue} component={EEditor} />
     <Files files={files} onRemoveFile={onRemoveFile} loading={loading} />
     <ButtonsRow>
-      <Button onClick={onCancel} secondary>Cancel</Button>
-      <Button type="button" onClick={onAddFile} secondary>Add File</Button>
+      <Button onClick={onCancel} secondary>
+        Cancel
+      </Button>
+      <Button type="button" onClick={onAddFile} secondary>
+        Add File
+      </Button>
       <Button
         disabled={!(dirty || !loading || defaultValue.length)}
         type="submit"
@@ -228,10 +238,18 @@ export const Review = ({ handleSubmit, onCancel, dirty, ...state }) => {
   const serviceList = forceArray(state.services).map(({ name, config }) =>
     <ServiceCard key={name}>
       <Dl>
-        <dt><ServiceName>{name}</ServiceName></dt>
-        <dt><ImageTitle>Image:</ImageTitle> <Image>{config.image}</Image></dt>
+        <dt>
+          <ServiceName>
+            {name}
+          </ServiceName>
+        </dt>
+        <dt>
+          <ImageTitle>Image:</ImageTitle> <Image>{config.image}</Image>
+        </dt>
         {config.environment.length
-          ? <dt><ImageTitle>Environment:</ImageTitle></dt>
+          ? <dt>
+              <ImageTitle>Environment:</ImageTitle>
+            </dt>
           : undefined}
         {config.environment.length
           ? <SimpleTable
diff --git a/packages/cp-frontend/src/components/messaging/error.js b/packages/cp-frontend/src/components/messaging/error.js
index 75a55f01..08652c02 100644
--- a/packages/cp-frontend/src/components/messaging/error.js
+++ b/packages/cp-frontend/src/components/messaging/error.js
@@ -4,7 +4,11 @@ import PropTypes from 'prop-types';
 import { P } from 'joyent-ui-toolkit';
 
 const ErrorMessage = ({ message = "Ooops, there's been an error!!!" }) => {
-  return <P>{message}</P>;
+  return (
+    <P>
+      {message}
+    </P>
+  );
 };
 
 ErrorMessage.propTypes = {
diff --git a/packages/cp-frontend/src/components/navigation/breadcrumb.js b/packages/cp-frontend/src/components/navigation/breadcrumb.js
index 86e8baa2..e5f2807f 100644
--- a/packages/cp-frontend/src/components/navigation/breadcrumb.js
+++ b/packages/cp-frontend/src/components/navigation/breadcrumb.js
@@ -23,11 +23,18 @@ const BreadcrumbContainer = styled.div`
 
 const getBreadcrumbItems = (...links) =>
   forceArray(links).map(({ pathname, name }, i) => {
-    const item = i + 1 >= links.length
-      ? name
-      : <BreadcrumbLink to={pathname}>{name}</BreadcrumbLink>;
+    const item =
+      i + 1 >= links.length
+        ? name
+        : <BreadcrumbLink to={pathname}>
+            {name}
+          </BreadcrumbLink>;
 
-    return <BreadcrumbItem key={name}>{item}</BreadcrumbItem>;
+    return (
+      <BreadcrumbItem key={name}>
+        {item}
+      </BreadcrumbItem>
+    );
   });
 
 const NavBreadcrumb = ({ links = [] }) =>
diff --git a/packages/cp-frontend/src/components/navigation/header.js b/packages/cp-frontend/src/components/navigation/header.js
index 009ac719..fdf81a7e 100644
--- a/packages/cp-frontend/src/components/navigation/header.js
+++ b/packages/cp-frontend/src/components/navigation/header.js
@@ -19,8 +19,12 @@ const NavHeader = ({ datacenter, username }) =>
         <StyledLogo src={Logo} />
       </Link>
     </HeaderBrand>
-    <HeaderItem>{datacenter}</HeaderItem>
-    <HeaderItem>{username}</HeaderItem>
+    <HeaderItem>
+      {datacenter}
+    </HeaderItem>
+    <HeaderItem>
+      {username}
+    </HeaderItem>
   </Header>;
 
 NavHeader.propTypes = {
diff --git a/packages/cp-frontend/src/components/service/delete.js b/packages/cp-frontend/src/components/service/delete.js
index c4a2b046..de39f433 100644
--- a/packages/cp-frontend/src/components/service/delete.js
+++ b/packages/cp-frontend/src/components/service/delete.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import styled from 'styled-components';
 import { ModalHeading, ModalText, Button } from 'joyent-ui-toolkit';
 
 const propTypes = {
@@ -15,10 +14,12 @@ const ServiceDelete = ({ service, onCancelClick, onConfirmClick }) =>
       Deleting a service: <br /> {service.name}
     </ModalHeading>
     <ModalText marginBottom="3">
-      Deleting a service can lead to irreverasable loss of data and failures
-      in your application. Are you sure you want to continue?
+      Deleting a service can lead to irreverasable loss of data and failures in
+      your application. Are you sure you want to continue?
     </ModalText>
-    <Button onClick={onCancelClick} secondary>Cancel</Button>
+    <Button onClick={onCancelClick} secondary>
+      Cancel
+    </Button>
     <Button onClick={onConfirmClick}>Delete service</Button>
   </div>;
 
diff --git a/packages/cp-frontend/src/components/service/scale.js b/packages/cp-frontend/src/components/service/scale.js
index 8cb885bb..4f11f3f6 100644
--- a/packages/cp-frontend/src/components/service/scale.js
+++ b/packages/cp-frontend/src/components/service/scale.js
@@ -1,7 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import styled from 'styled-components';
-import unitcalc from 'unitcalc';
 
 import { ModalHeading, ModalText, Button } from 'joyent-ui-toolkit';
 import {
@@ -19,8 +17,13 @@ const ServiceScale = ({
   pristine
 }) =>
   <form onSubmit={handleSubmit}>
-    <ModalHeading>Scaling a service: <br />{service.name}</ModalHeading>
-    <ModalText>Choose how many instances of a service you want to have running.</ModalText>
+    <ModalHeading>
+      Scaling a service: <br />
+      {service.name}
+    </ModalHeading>
+    <ModalText>
+      Choose how many instances of a service you want to have running.
+    </ModalText>
     <FormGroup
       name="replicas"
       normalize={NumberInputNormalize({ minValue: 1 })}
@@ -29,7 +32,9 @@ const ServiceScale = ({
       <FormMeta />
       <NumberInput minValue={1} />
     </FormGroup>
-    <Button secondary onClick={onCancelClick}>Cancel</Button>
+    <Button secondary onClick={onCancelClick}>
+      Cancel
+    </Button>
     <Button type="submit" disabled={pristine || invalid} secondary>
       Scale
     </Button>
diff --git a/packages/cp-frontend/src/components/services/list-item.js b/packages/cp-frontend/src/components/services/list-item.js
index 7a27c6d7..feafaca2 100644
--- a/packages/cp-frontend/src/components/services/list-item.js
+++ b/packages/cp-frontend/src/components/services/list-item.js
@@ -5,7 +5,6 @@ import styled from 'styled-components';
 import {
   Card,
   CardView,
-  CardMeta,
   CardTitle,
   CardSubTitle,
   CardDescription,
@@ -16,7 +15,11 @@ import {
   Anchor
 } from 'joyent-ui-toolkit';
 
-import { InstancesIcon, HealthyIcon, UnhealthyIcon, P } from 'joyent-ui-toolkit';
+import {
+  InstancesIcon,
+  HealthyIcon,
+  UnhealthyIcon
+} from 'joyent-ui-toolkit';
 
 import Status from './status';
 
@@ -37,7 +40,6 @@ const ServiceListItem = ({
   service = {},
   isChild = false
 }) => {
-
   const children = service.children
     ? service.children.map(service =>
         <ServiceListItem
@@ -101,16 +103,16 @@ const ServiceListItem = ({
   const healthyInfo = service.instancesHealthy
     ? <CardInfo
         icon={<HealthyIcon />}
-        iconPosition='left'
-        label='Healthy'
-        color='dark'
+        iconPosition="left"
+        label="Healthy"
+        color="dark"
       />
     : <CardInfo
         icon={<UnhealthyIcon />}
-        iconPosition='left'
-        label='Unhealthy'
-        color='dark'
-      />
+        iconPosition="left"
+        label="Unhealthy"
+        color="dark"
+      />;
 
   const view = children
     ? <CardGroupView>
diff --git a/packages/cp-frontend/src/components/services/quick-actions.js b/packages/cp-frontend/src/components/services/quick-actions.js
index 2ff85182..a11cda75 100644
--- a/packages/cp-frontend/src/components/services/quick-actions.js
+++ b/packages/cp-frontend/src/components/services/quick-actions.js
@@ -55,22 +55,34 @@ const ServicesQuickActions = ({
       : instance.status;
   }, null);
 
-  const startService = status === 'RUNNING'
-    ? null
-    : <TooltipButton onClick={handleStartClick} disabled={disabled}>Start</TooltipButton>;
+  const startService =
+    status === 'RUNNING'
+      ? null
+      : <TooltipButton onClick={handleStartClick} disabled={disabled}>
+          Start
+        </TooltipButton>;
 
-  const stopService = status === 'STOPPED'
-    ? null
-    : <TooltipButton onClick={handleStopClick} disabled={disabled}>Stop</TooltipButton>;
+  const stopService =
+    status === 'STOPPED'
+      ? null
+      : <TooltipButton onClick={handleStopClick} disabled={disabled}>
+          Stop
+        </TooltipButton>;
 
   return (
     <Tooltip {...p} onBlur={onBlur}>
-      <TooltipButton onClick={handleScaleClick} disabled={disabled}>Scale</TooltipButton>
-      <TooltipButton onClick={handleRestartClick} disabled={disabled}>Restart</TooltipButton>
+      <TooltipButton onClick={handleScaleClick} disabled={disabled}>
+        Scale
+      </TooltipButton>
+      <TooltipButton onClick={handleRestartClick} disabled={disabled}>
+        Restart
+      </TooltipButton>
       {startService}
       {stopService}
       <TooltipDivider />
-      <TooltipButton onClick={handleDeleteClick} disabled={disabled}>Delete</TooltipButton>
+      <TooltipButton onClick={handleDeleteClick} disabled={disabled}>
+        Delete
+      </TooltipButton>
     </Tooltip>
   );
 };
diff --git a/packages/cp-frontend/src/components/services/status.js b/packages/cp-frontend/src/components/services/status.js
index fc713ea7..81eaccd5 100644
--- a/packages/cp-frontend/src/components/services/status.js
+++ b/packages/cp-frontend/src/components/services/status.js
@@ -24,8 +24,7 @@ const StyledTransitionalStatus = StyledStatus.extend`
 `;
 
 const ServiceStatus = ({ service }) => {
-
-  const getInstanceStatuses = (instanceStatuses) =>
+  const getInstanceStatuses = instanceStatuses =>
     instanceStatuses.map((instanceStatus, index) => {
       const { status, count } = instanceStatus;
 
@@ -39,19 +38,15 @@ const ServiceStatus = ({ service }) => {
     });
 
   return service.transitionalStatus
-    ? (
-      <StyledStatusContainer>
+    ? <StyledStatusContainer>
         <StatusLoader />
         <StyledTransitionalStatus>
-          { service.status ? service.status.toLowerCase() : '' }
+          {service.status ? service.status.toLowerCase() : ''}
         </StyledTransitionalStatus>
       </StyledStatusContainer>
-    )
-    : (
-      <StyledStatusContainer>
+    : <StyledStatusContainer>
         {getInstanceStatuses(service.instanceStatuses)}
-      </StyledStatusContainer>
-    );
+      </StyledStatusContainer>;
 };
 
 ServiceStatus.propTypes = {
diff --git a/packages/cp-frontend/src/containers/deployment-groups/create.js b/packages/cp-frontend/src/containers/deployment-groups/create.js
index 96bb15ee..e78e3185 100644
--- a/packages/cp-frontend/src/containers/deployment-groups/create.js
+++ b/packages/cp-frontend/src/containers/deployment-groups/create.js
@@ -19,7 +19,10 @@ export default ({
     <LayoutContainer>
       <H2>Creating deployment group</H2>
       {loading && <DeploymentGroupsLoading />}
-      {error && <span>{error.toString()}</span>}
+      {error &&
+        <span>
+          {error.toString()}
+        </span>}
       <Progress stage={stage} create />
       <ManifestEditOrCreate
         manifest={manifest}
diff --git a/packages/cp-frontend/src/containers/deployment-groups/import.js b/packages/cp-frontend/src/containers/deployment-groups/import.js
index f81d4ad2..3d25b363 100644
--- a/packages/cp-frontend/src/containers/deployment-groups/import.js
+++ b/packages/cp-frontend/src/containers/deployment-groups/import.js
@@ -44,7 +44,10 @@ class DeploymentGroupImport extends Component {
       <LayoutContainer>
         <H2>Importing deployment group</H2>
         {loading && <DeploymentGroupsLoading />}
-        {error && <span>{error.toString()}</span>}
+        {error &&
+          <span>
+            {error.toString()}
+          </span>}
       </LayoutContainer>
     );
   }
diff --git a/packages/cp-frontend/src/containers/deployment-groups/list.js b/packages/cp-frontend/src/containers/deployment-groups/list.js
index ced9b16a..8aa1c55f 100644
--- a/packages/cp-frontend/src/containers/deployment-groups/list.js
+++ b/packages/cp-frontend/src/containers/deployment-groups/list.js
@@ -12,7 +12,7 @@ import { ErrorMessage } from '@components/messaging';
 import { DeploymentGroupsLoading } from '@components/deployment-groups';
 import DeploymentGroupsQuery from '@graphql/DeploymentGroups.gql';
 import DeploymentGroupsImportableQuery from '@graphql/DeploymentGroupsImportable.gql';
-import { H2, H3, Small, IconButton, BinIcon, Button } from 'joyent-ui-toolkit';
+import { H2, H3, Small, IconButton, BinIcon } from 'joyent-ui-toolkit';
 
 const Title = H2.extend`
   margin-top: ${remcalc(2)};
@@ -122,7 +122,9 @@ const DeploymentGroupList = ({
     <Col xs={12} sm={4} md={3} lg={3} key={slug}>
       <Box>
         <StyledLink to={`${match.path}/${slug}`}>
-          <ServiceTitle>{name}</ServiceTitle>
+          <ServiceTitle>
+            {name}
+          </ServiceTitle>
         </StyledLink>
         <StyledIconButton to={`${match.url}/${slug}/delete`}>
           <BinIcon />
@@ -146,7 +148,9 @@ const DeploymentGroupList = ({
         <BoxCreate>
           <StyledCreateLink to={`${match.path}/~import/${slug}`}>
             <Oval>&#10549;</Oval>
-            <CreateTitle>{name}</CreateTitle>
+            <CreateTitle>
+              {name}
+            </CreateTitle>
           </StyledCreateLink>
         </BoxCreate>
       </Col>
@@ -181,9 +185,10 @@ export default compose(
       pollInterval: 1000
     },
     props: ({ data: { deploymentGroups, loading, error } }) => ({
-      deploymentGroups: deploymentGroups && deploymentGroups.length
-        ? deploymentGroups.filter(dg => dg.status !== 'DELETED')
-        : null,
+      deploymentGroups:
+        deploymentGroups && deploymentGroups.length
+          ? deploymentGroups.filter(dg => dg.status !== 'DELETED')
+          : null,
       loading,
       error
     })
diff --git a/packages/cp-frontend/src/containers/instances/list.js b/packages/cp-frontend/src/containers/instances/list.js
index 36308e43..59943de6 100644
--- a/packages/cp-frontend/src/containers/instances/list.js
+++ b/packages/cp-frontend/src/containers/instances/list.js
@@ -63,12 +63,13 @@ const InstanceListGql = graphql(InstancesQuery, {
     };
   },
   props: ({ data: { deploymentGroup, loading, error } }) => ({
-    instances: deploymentGroup && deploymentGroup.services
-      ? deploymentGroup.services.reduce(
-          (instances, service) => instances.concat(service.instances),
-          []
-        )
-      : null,
+    instances:
+      deploymentGroup && deploymentGroup.services
+        ? deploymentGroup.services.reduce(
+            (instances, service) => instances.concat(service.instances),
+            []
+          )
+        : null,
     loading,
     error
   })
diff --git a/packages/cp-frontend/src/containers/manifest/edit-or-create.js b/packages/cp-frontend/src/containers/manifest/edit-or-create.js
index e160b23f..6bdec156 100644
--- a/packages/cp-frontend/src/containers/manifest/edit-or-create.js
+++ b/packages/cp-frontend/src/containers/manifest/edit-or-create.js
@@ -357,7 +357,11 @@ class DeploymentGroupEditOrCreate extends Component {
     const { error, defaultStage, manifestStage } = this.state;
 
     if (error) {
-      return <span>{error}</span>;
+      return (
+        <span>
+          {error}
+        </span>
+      );
     }
 
     const { match, create } = this.props;
diff --git a/packages/cp-frontend/src/containers/manifest/index.js b/packages/cp-frontend/src/containers/manifest/index.js
index 9724ecf4..866e2572 100644
--- a/packages/cp-frontend/src/containers/manifest/index.js
+++ b/packages/cp-frontend/src/containers/manifest/index.js
@@ -22,28 +22,33 @@ const Manifest = ({
 }) => {
   const stage = match.params.stage;
   const _loading = !loading ? null : <DeploymentGroupsLoading />;
-  const _error = !error ? null : <span>{error.toString()}</span>;
-
-  const _view = loading || !deploymentGroup
+  const _error = !error
     ? null
-    : <ManifestEditOrCreate
-        manifest={manifest}
-        environment={environment}
-        deploymentGroup={deploymentGroup}
-        edit
-      />;
+    : <span>
+        {error.toString()}
+      </span>;
 
-  const _notice = !error &&
+  const _view =
+    loading || !deploymentGroup
+      ? null
+      : <ManifestEditOrCreate
+          manifest={manifest}
+          environment={environment}
+          deploymentGroup={deploymentGroup}
+          edit
+        />;
+
+  const _notice =
+    !error &&
     !loading &&
     deploymentGroup &&
     deploymentGroup.imported &&
     !manifest
-    ? <span>
-        Since this DeploymentGroup was imported, it doesn&#x27;t have the
-        initial
-        manifest
-      </span>
-    : null;
+      ? <span>
+          Since this DeploymentGroup was imported, it doesn&#x27;t have the
+          initial manifest
+        </span>
+      : null;
 
   return (
     <LayoutContainer>
@@ -78,7 +83,9 @@ export default compose(
         slug: props.match.params.deploymentGroup
       }
     }),
-    props: ({ data: { deploymentGroups, loading, error, startPolling, stopPolling } }) => {
+    props: ({
+      data: { deploymentGroups, loading, error, startPolling, stopPolling }
+    }) => {
       const dgs = forceArray(deploymentGroups);
 
       if (!dgs.length) {
diff --git a/packages/cp-frontend/src/containers/navigation/menu.js b/packages/cp-frontend/src/containers/navigation/menu.js
index df224fcd..480bdea5 100644
--- a/packages/cp-frontend/src/containers/navigation/menu.js
+++ b/packages/cp-frontend/src/containers/navigation/menu.js
@@ -2,8 +2,8 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { Menu as MenuComponent } from '@components/navigation';
 
-const Menu = ({match, sections}) => {
-  if(!sections || !sections.length) {
+const Menu = ({ match, sections }) => {
+  if (!sections || !sections.length) {
     return null;
   }
 
@@ -13,8 +13,8 @@ const Menu = ({match, sections}) => {
       pathname: `${match.url}/${section.pathname}`
     };
   });
-  return <MenuComponent links={sectionsWithPathnames} /> ;
-}
+  return <MenuComponent links={sectionsWithPathnames} />;
+};
 
 const ConnectedMenu = connect(
   (state, ownProps) => {
diff --git a/packages/cp-frontend/src/containers/service/service-gql.js b/packages/cp-frontend/src/containers/service/service-gql.js
index 2b67955e..3c995bed 100644
--- a/packages/cp-frontend/src/containers/service/service-gql.js
+++ b/packages/cp-frontend/src/containers/service/service-gql.js
@@ -14,11 +14,12 @@ export default graphql(InstancesQuery, {
     };
   },
   props: ({ data: { deploymentGroup, loading, error } }) => ({
-    service: deploymentGroup &&
+    service:
+      deploymentGroup &&
       deploymentGroup.services &&
       deploymentGroup.services.length
-      ? deploymentGroup.services[0]
-      : null,
+        ? deploymentGroup.services[0]
+        : null,
     loading,
     error
   })
diff --git a/packages/cp-frontend/src/containers/services/list.js b/packages/cp-frontend/src/containers/services/list.js
index a0a32695..ff67ea62 100644
--- a/packages/cp-frontend/src/containers/services/list.js
+++ b/packages/cp-frontend/src/containers/services/list.js
@@ -70,8 +70,8 @@ class ServiceList extends Component {
       const position = {
         left:
           buttonRect.left -
-            listRect.left +
-            (buttonRect.right - buttonRect.left) / 2,
+          listRect.left +
+          (buttonRect.right - buttonRect.left) / 2,
         top: buttonRect.bottom - listRect.top
       };
 
diff --git a/packages/cp-frontend/src/containers/services/menu.js b/packages/cp-frontend/src/containers/services/menu.js
index 013110ae..aeb23dcd 100644
--- a/packages/cp-frontend/src/containers/services/menu.js
+++ b/packages/cp-frontend/src/containers/services/menu.js
@@ -1,16 +1,13 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Col, Row } from 'react-styled-flexboxgrid';
-import styled from 'styled-components';
 import remcalc from 'remcalc';
 import unitcalc from 'unitcalc';
 import { LayoutContainer } from '@components/layout';
 
 import {
-  Button,
   H2,
   FormGroup,
-  Input,
   Toggle,
   ToggleList,
   Legend
@@ -26,18 +23,6 @@ const PaddedRow = Row.extend`
   margin-bottom: ${remcalc(18)}
 `;
 
-const StyledForm = FormGroup.extend`
-  width: 60%;
-  float: left;
-  margin: 0;
-`;
-
-const StyledFilter = styled(Input)`
-  margin: 0;
-`;
-
-const handleAddService = () => console.log('Adding a service...');
-
 const ServicesMenu = ({ location, history: { push } }) => {
   const toggleValue = location.pathname.split('-').pop();
 
@@ -58,8 +43,12 @@ const ServicesMenu = ({ location, history: { push } }) => {
           <FormGroup name="service-view" value={toggleValue}>
             <StyledLegend>View</StyledLegend>
             <ToggleList>
-              <Toggle value="list" onChange={handleToggle}>List</Toggle>
-              <Toggle value="topology" onChange={handleToggle}>Topology</Toggle>
+              <Toggle value="list" onChange={handleToggle}>
+                List
+              </Toggle>
+              <Toggle value="topology" onChange={handleToggle}>
+                Topology
+              </Toggle>
             </ToggleList>
           </FormGroup>
         </Col>
diff --git a/packages/cp-frontend/src/graphql/DeploymentGroupConfig.gql b/packages/cp-frontend/src/graphql/DeploymentGroupConfig.gql
index ed4bcf4e..5488cd2a 100644
--- a/packages/cp-frontend/src/graphql/DeploymentGroupConfig.gql
+++ b/packages/cp-frontend/src/graphql/DeploymentGroupConfig.gql
@@ -1,7 +1,21 @@
 #import "./ServiceInfo.gql"
 
-query config($deploymentGroupName: String!, $type: ManifestType!, $format: ManifestFormat!, $environment: String!, $files: [KeyValueInput]!, $raw: String!) {
-  config(deploymentGroupName: $deploymentGroupName, type: $type, format: $format, environment: $environment, files: $files, raw: $raw) {
+query config(
+  $deploymentGroupName: String!
+  $type: ManifestType!
+  $format: ManifestFormat!
+  $environment: String!
+  $files: [KeyValueInput]!
+  $raw: String!
+) {
+  config(
+    deploymentGroupName: $deploymentGroupName
+    type: $type
+    format: $format
+    environment: $environment
+    files: $files
+    raw: $raw
+  ) {
     ...ServiceInfo
     config {
       id
diff --git a/packages/cp-frontend/src/graphql/DeploymentGroupProvision.gql b/packages/cp-frontend/src/graphql/DeploymentGroupProvision.gql
index a321bc61..f7da47d1 100644
--- a/packages/cp-frontend/src/graphql/DeploymentGroupProvision.gql
+++ b/packages/cp-frontend/src/graphql/DeploymentGroupProvision.gql
@@ -1,5 +1,19 @@
-mutation provisionManifest($deploymentGroupId: ID!, $type: ManifestType!, $format: ManifestFormat!, $environment: String!, $files: [KeyValueInput]!, $raw: String!) {
-  provisionManifest(deploymentGroupId: $deploymentGroupId, type: $type, format: $format, environment: $environment, files: $files, raw: $raw) {
+mutation provisionManifest(
+  $deploymentGroupId: ID!
+  $type: ManifestType!
+  $format: ManifestFormat!
+  $environment: String!
+  $files: [KeyValueInput]!
+  $raw: String!
+) {
+  provisionManifest(
+    deploymentGroupId: $deploymentGroupId
+    type: $type
+    format: $format
+    environment: $environment
+    files: $files
+    raw: $raw
+  ) {
     scale {
       serviceName
       replicas
diff --git a/packages/cp-frontend/src/graphql/Services.gql b/packages/cp-frontend/src/graphql/Services.gql
index 5931cfef..5bc7d44f 100644
--- a/packages/cp-frontend/src/graphql/Services.gql
+++ b/packages/cp-frontend/src/graphql/Services.gql
@@ -1,7 +1,7 @@
 #import "./DeploymentGroupInfo.gql"
 #import "./ServiceInfo.gql"
 
-query Services($deploymentGroupSlug: String!){
+query Services($deploymentGroupSlug: String!) {
   deploymentGroup(slug: $deploymentGroupSlug) {
     ...DeploymentGroupInfo
     services {
diff --git a/packages/cp-frontend/src/router.js b/packages/cp-frontend/src/router.js
index ce2e9020..93cf2550 100644
--- a/packages/cp-frontend/src/router.js
+++ b/packages/cp-frontend/src/router.js
@@ -19,9 +19,7 @@ import {
   ServicesMenu
 } from '@containers/services';
 
-import {
-  DeploymentGroupDelete
-} from '@containers/deployment-group';
+import { DeploymentGroupDelete } from '@containers/deployment-group';
 
 const Container = styled.div`
   display: flex;
@@ -46,7 +44,6 @@ const serviceRedirect = p =>
 const Router = (
   <BrowserRouter>
     <Container>
-
       <Route path="/" component={Header} />
 
       <Switch>
@@ -70,12 +67,16 @@ const Router = (
           path="/deployment-groups/:deploymentGroup/services/:service"
           component={Menu}
         />
-      <Route path="/deployment-groups/:deploymentGroup" component={Menu} />
+        <Route path="/deployment-groups/:deploymentGroup" component={Menu} />
       </Switch>
 
       <Route path="/" exact component={rootRedirect} />
       <Route path="/deployment-groups" exact component={DeploymentGroupList} />
-      <Route path="/deployment-groups/:deploymentGroup/delete" exact component={DeploymentGroupList} />
+      <Route
+        path="/deployment-groups/:deploymentGroup/delete"
+        exact
+        component={DeploymentGroupList}
+      />
 
       <Route
         path="/deployment-groups/:deploymentGroup"
@@ -168,7 +169,6 @@ const Router = (
         exact
         component={ServiceDelete}
       />
-
     </Container>
   </BrowserRouter>
 );
diff --git a/packages/cp-frontend/src/state/reducers/ui.js b/packages/cp-frontend/src/state/reducers/ui.js
index 165587f3..105b8406 100644
--- a/packages/cp-frontend/src/state/reducers/ui.js
+++ b/packages/cp-frontend/src/state/reducers/ui.js
@@ -6,10 +6,11 @@ export default handleActions(
     [toggleServicesQuickActions.toString()]: (state, action) => {
       const { position, service, show } = action.payload;
 
-      const s = show === undefined
-        ? !state.services.quickActions.service ||
+      const s =
+        show === undefined
+          ? !state.services.quickActions.service ||
             service.id !== state.services.quickActions.service.id
-        : show;
+          : show;
 
       const quickActions = s
         ? {
diff --git a/packages/cp-frontend/src/state/selectors.js b/packages/cp-frontend/src/state/selectors.js
index 7c8951bd..8d635c46 100644
--- a/packages/cp-frontend/src/state/selectors.js
+++ b/packages/cp-frontend/src/state/selectors.js
@@ -13,7 +13,7 @@ const deploymentGroupBySlug = deploymentGroupSlug =>
         ? Object.keys(apollo.data).reduce(
             (dg, k) =>
               apollo.data[k].__typename === 'DeploymentGroup' &&
-                apollo.data[k].slug === deploymentGroupSlug
+              apollo.data[k].slug === deploymentGroupSlug
                 ? apollo.data[k]
                 : dg,
             null
@@ -29,7 +29,7 @@ const serviceBySlug = serviceSlug =>
         ? Object.keys(apollo.data).reduce(
             (s, k) =>
               apollo.data[k].__typename === 'Service' &&
-                apollo.data[k].slug === serviceSlug
+              apollo.data[k].slug === serviceSlug
                 ? apollo.data[k]
                 : s,
             null
@@ -56,9 +56,6 @@ const instancesByServiceId = serviceId =>
 
 // Apollo gql utils //
 
-const findService = (services, uuid) =>
-  services.reduce((service, s) => (s.uuid === uuid ? s : service), null);
-
 const activeInstanceStatuses = [
   'PROVISIONING',
   'READY',
@@ -77,7 +74,6 @@ const transitionalServiceStatuses = [
 ];
 
 const getInstanceStatuses = service => {
-
   const instanceStatuses = service.instances.reduce((statuses, instance) => {
     // if (instance.status !== 'RUNNING') {
     if (statuses[instance.status]) {
@@ -107,36 +103,34 @@ const getInstancesActive = instanceStatuses => {
 
 const getInstancesHealthy = instances => {
   return instances.reduce(
-    (healthy, instance) =>
-      instance.healthy === 'HEALTHY' ? healthy : false,
-      true
+    (healthy, instance) => (instance.healthy === 'HEALTHY' ? healthy : false),
+    true
   );
 };
 
 const getService = (service, index) => {
-
   const instanceStatuses = getInstanceStatuses(service);
   const instancesActive = getInstancesActive(instanceStatuses);
   const instancesHealthy = getInstancesHealthy(service.instances);
-  const transitionalStatus = transitionalServiceStatuses.indexOf(service.status) !== -1;
-  return ({
-      index,
-      ...service,
-      instanceStatuses,
-      instancesActive,
-      instancesHealthy,
-      transitionalStatus,
-      isConsul: service.slug === 'consul'
-    });
+  const transitionalStatus =
+    transitionalServiceStatuses.indexOf(service.status) !== -1;
+  return {
+    index,
+    ...service,
+    instanceStatuses,
+    instancesActive,
+    instancesHealthy,
+    transitionalStatus,
+    isConsul: service.slug === 'consul'
+  };
 };
 
 const processServices = services => {
   return forceArray(services).reduce((ss, s, i) => {
-
-    if(s.status !== 'DELETED') {
+    if (s.status !== 'DELETED') {
       const service = getService(s, i);
-      if(s.branches && s.branches.length) {
-        service.children = processServices(s.branches)
+      if (s.branches && s.branches.length) {
+        service.children = processServices(s.branches);
       }
       ss.push(service);
     }
@@ -148,24 +142,28 @@ const processServices = services => {
 const processServicesForTopology = services => {
   const processedServices = processServices(services);
 
-  const connectedServices = processedServices.reduce(
-    (connections, service) => {
-      if(!service.connections || !service.connections.length) {
-        return connections;
-      }
+  const connectedServices = processedServices.reduce((connections, service) => {
+    if (!service.connections || !service.connections.length) {
+      return connections;
+    }
 
-      const existingConnections = service.connections.reduce((connections, connection) => {
-        const connectionExists = processedServices.filter(ps => ps.id === connection).length;
-        if(connectionExists) {
+    const existingConnections = service.connections.reduce(
+      (connections, connection) => {
+        const connectionExists = processedServices.filter(
+          ps => ps.id === connection
+        ).length;
+        if (connectionExists) {
           connections.push(connection);
         }
         return connections;
-      }, []);
+      },
+      []
+    );
 
-      return existingConnections.length
-        ? connections.concat(existingConnections).concat(service.id)
-        : connections
-    }, []);
+    return existingConnections.length
+      ? connections.concat(existingConnections).concat(service.id)
+      : connections;
+  }, []);
 
   return processedServices.map(service => ({
     ...service,
diff --git a/packages/cp-frontend/src/state/store.js b/packages/cp-frontend/src/state/store.js
index 3d97e86b..ab127af2 100644
--- a/packages/cp-frontend/src/state/store.js
+++ b/packages/cp-frontend/src/state/store.js
@@ -4,13 +4,14 @@ import { ApolloClient, createNetworkInterface } from 'react-apollo';
 import state from './state';
 import { ui } from './reducers';
 
-const GLOBAL = typeof window === 'object'
-  ? window
-  : {
-      location: {
-        hostname: '0.0.0.0'
-      }
-    };
+const GLOBAL =
+  typeof window === 'object'
+    ? window
+    : {
+        location: {
+          hostname: '0.0.0.0'
+        }
+      };
 
 const GQL_PORT = process.env.REACT_APP_GQL_PORT || 80;
 const GQL_HOSTNAME =
diff --git a/packages/cp-frontend/test/unit/header.js b/packages/cp-frontend/test/unit/header.js
index ce946771..e9bfef52 100644
--- a/packages/cp-frontend/test/unit/header.js
+++ b/packages/cp-frontend/test/unit/header.js
@@ -10,6 +10,12 @@ import Header from '@components/navigation/header';
 import { Router } from './mocks';
 
 it('renders <Header /> without throwing', () => {
-  const tree = renderer.create(<Router><Header /></Router>).toJSON();
+  const tree = renderer
+    .create(
+      <Router>
+        <Header />
+      </Router>
+    )
+    .toJSON();
   expect(tree).toMatchStyledComponentsSnapshot();
 });
diff --git a/packages/cp-frontend/test/unit/mocks/router.js b/packages/cp-frontend/test/unit/mocks/router.js
index 47dbba36..2b0013ab 100644
--- a/packages/cp-frontend/test/unit/mocks/router.js
+++ b/packages/cp-frontend/test/unit/mocks/router.js
@@ -1,4 +1,7 @@
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 
-export default ({ children }) => <MemoryRouter>{children}</MemoryRouter>;
+export default ({ children }) =>
+  <MemoryRouter>
+    {children}
+  </MemoryRouter>;
diff --git a/packages/cp-frontend/test/unit/mocks/store.js b/packages/cp-frontend/test/unit/mocks/store.js
index b0d828c0..181065b6 100644
--- a/packages/cp-frontend/test/unit/mocks/store.js
+++ b/packages/cp-frontend/test/unit/mocks/store.js
@@ -3,4 +3,6 @@ import { client, store } from '@state/store';
 import { ApolloProvider } from 'react-apollo';
 
 export default ({ children }) =>
-  <ApolloProvider client={client} store={store}>{children}</ApolloProvider>;
+  <ApolloProvider client={client} store={store}>
+    {children}
+  </ApolloProvider>;
diff --git a/packages/cp-frontend/test/unit/mocks/theme.js b/packages/cp-frontend/test/unit/mocks/theme.js
index f209a958..7cad5ab3 100644
--- a/packages/cp-frontend/test/unit/mocks/theme.js
+++ b/packages/cp-frontend/test/unit/mocks/theme.js
@@ -3,4 +3,6 @@ import { ThemeProvider } from 'styled-components';
 import { theme } from 'joyent-ui-toolkit';
 
 export default ({ children }) =>
-  <ThemeProvider theme={theme}>{children}</ThemeProvider>;
+  <ThemeProvider theme={theme}>
+    {children}
+  </ThemeProvider>;
diff --git a/packages/cp-gql-mock-server/package.json b/packages/cp-gql-mock-server/package.json
index 776bc958..2c3aa345 100644
--- a/packages/cp-gql-mock-server/package.json
+++ b/packages/cp-gql-mock-server/package.json
@@ -46,12 +46,8 @@
     "tap-xunit": "^1.7.0"
   },
   "ava": {
-    "files": [
-      "test/*.js"
-    ],
-    "source": [
-      "src/*.js"
-    ],
+    "files": ["test/*.js"],
+    "source": ["src/*.js"],
     "failFast": true
   }
 }
diff --git a/packages/cp-gql-mock-server/src/resolvers.js b/packages/cp-gql-mock-server/src/resolvers.js
index 06bc7779..05d73fc6 100644
--- a/packages/cp-gql-mock-server/src/resolvers.js
+++ b/packages/cp-gql-mock-server/src/resolvers.js
@@ -156,20 +156,17 @@ const deleteDeploymentGroup = options => {
         )
       )
     )
-    .then(() => {
-      const deploymentGroup = deploymentGroups
-        .filter(dg => dg.id === dgId)
-        .shift();
-      deploymentGroup.status = 'DELETING';
-      return deploymentGroup;
-      return { deploymentGroupId: dgId };
-      return getDeploymentGroups({ id: dgId });
-    });
+    .then(() =>
+      Object.assign({}, deploymentGroups.filter(dg => dg.id === dgId).shift(), {
+        status: 'DELETING'
+      })
+    );
 
-  const timeout = setTimeout(() => {
+  setTimeout(() => {
     const deploymentGroup = deploymentGroups
       .filter(dg => dg.id === dgId)
       .shift();
+
     deploymentGroup.status = 'DELETED';
   }, 5000);
 
@@ -328,9 +325,10 @@ const handleStatusUpdateRequest = (
   instancesStatus
 ) => {
   // this is what we need to delay
-  const timeout = setTimeout(() => {
+  setTimeout(() => {
     updateServiceAndInstancesStatus(serviceId, serviceStatus, instancesStatus);
   }, 5000);
+
   // this is what we'll need to return
   return updateServiceAndInstancesStatus(
     serviceId,
diff --git a/packages/cp-gql-mock-server/test/index.js b/packages/cp-gql-mock-server/test/index.js
index d9b0d7a0..3475ba76 100644
--- a/packages/cp-gql-mock-server/test/index.js
+++ b/packages/cp-gql-mock-server/test/index.js
@@ -31,10 +31,6 @@ const getClient = () =>
       })
     });
 
-    const close = () => {
-      client.resetStore();
-    };
-
     server.stdout.on('data', d => {
       if (/server started at /.test(d)) {
         resolve(client);
@@ -281,7 +277,7 @@ test('should delete DeploymentGroup', async t => {
   t.snapshot(JSON.stringify(fDgsBefore.data, null, 2));
   t.snapshot(JSON.stringify(fDgsDirectBefore.data, null, 2));
 
-  const deleted = await client.mutate({
+  await client.mutate({
     fetchPolicy: 'network-only',
     mutation: gql(await fetchTag('delete-deployment-group')),
     variables: {
@@ -396,7 +392,7 @@ test('should scale up', async t => {
     }
   });
 
-  const scale = await client.mutate({
+  await client.mutate({
     fetchPolicy: 'network-only',
     mutation: gql(await fetchTag('scale')),
     variables: {
@@ -456,7 +452,7 @@ test('should scale down', async t => {
     }
   });
 
-  const scaleUp = await client.mutate({
+  await client.mutate({
     fetchPolicy: 'network-only',
     mutation: gql(await fetchTag('scale')),
     variables: {
@@ -475,7 +471,7 @@ test('should scale down', async t => {
     }
   });
 
-  const scaleDown = await client.mutate({
+  await client.mutate({
     fetchPolicy: 'network-only',
     mutation: gql(await fetchTag('scale')),
     variables: {
@@ -520,7 +516,7 @@ test("should delete Service's", async t => {
     }
   });
 
-  const provision = await client.mutate({
+  await client.mutate({
     fetchPolicy: 'network-only',
     mutation: gql(await fetchTag('provision-manifest')),
     variables: {
@@ -590,7 +586,7 @@ test("should restart Service's", async t => {
     }
   });
 
-  const provision = await client.mutate({
+  await client.mutate({
     fetchPolicy: 'network-only',
     mutation: gql(await fetchTag('provision-manifest')),
     variables: {
@@ -669,7 +665,7 @@ test("should stop Service's", async t => {
     }
   });
 
-  const provision = await client.mutate({
+  await client.mutate({
     fetchPolicy: 'network-only',
     mutation: gql(await fetchTag('provision-manifest')),
     variables: {
@@ -748,7 +744,7 @@ test("should start Service's", async t => {
     }
   });
 
-  const provision = await client.mutate({
+  await client.mutate({
     fetchPolicy: 'network-only',
     mutation: gql(await fetchTag('provision-manifest')),
     variables: {
diff --git a/packages/cp-gql-mock-server/test/tags/scale.gql b/packages/cp-gql-mock-server/test/tags/scale.gql
index a09dd1f7..ab0c3685 100644
--- a/packages/cp-gql-mock-server/test/tags/scale.gql
+++ b/packages/cp-gql-mock-server/test/tags/scale.gql
@@ -1,11 +1,5 @@
-mutation scale(
-  $serviceId: ID!
-  $replicas: Int!
-) {
-  scale(
-    serviceId: $serviceId
-    replicas: $replicas
-  ) {
+mutation scale($serviceId: ID!, $replicas: Int!) {
+  scale(serviceId: $serviceId, replicas: $replicas) {
     id
   }
 }
diff --git a/packages/docker-compose-client/lib/index.js b/packages/docker-compose-client/lib/index.js
index ddaae867..47967430 100644
--- a/packages/docker-compose-client/lib/index.js
+++ b/packages/docker-compose-client/lib/index.js
@@ -23,12 +23,17 @@ module.exports = class DockerComposeClient extends EventEmitter {
   }
 
   provision({ projectName, environment, manifest, files }, cb) {
-    this._invoke('up', {
-      // eslint-disable-next-line camelcase
-      project_name: projectName,
-      files,
-      environment
-    }, manifest, cb);
+    this._invoke(
+      'up',
+      {
+        // eslint-disable-next-line camelcase
+        project_name: projectName,
+        files,
+        environment
+      },
+      manifest,
+      cb
+    );
   }
 
   scale({ projectName, services, environment, manifest, files }, cb) {
diff --git a/packages/manifest-editor/test/index.js b/packages/manifest-editor/test/index.js
index 517e8554..7bd1408c 100644
--- a/packages/manifest-editor/test/index.js
+++ b/packages/manifest-editor/test/index.js
@@ -1,6 +1,6 @@
-import React from 'react';
-import renderer from 'react-test-renderer';
-import ManifestEditor from '../src/index';
+// import React from 'react';
+// import renderer from 'react-test-renderer';
+// import ManifestEditor from '../src/index';
 
 // It('renders <ManifestEditor /> correctly', () => {
 //   const tree = renderer.create(<ManifestEditor />).toJSON();
diff --git a/packages/normalized-styled-components/package.json b/packages/normalized-styled-components/package.json
index 00e12f9b..4ff2a7cd 100644
--- a/packages/normalized-styled-components/package.json
+++ b/packages/normalized-styled-components/package.json
@@ -63,17 +63,13 @@
   "jest": {
     "testEnvironment": "jsdom",
     "testRegex": "test/index.js",
-    "setupFiles": [
-      "<rootDir>/node_modules/react-scripts/config/polyfills.js"
-    ],
+    "setupFiles": ["<rootDir>/node_modules/react-scripts/config/polyfills.js"],
     "testEnvironment": "node",
     "transform": {
       "^.+\\.(js|jsx)$": "<rootDir>/node_modules/react-scripts/config/jest/babelTransform.js",
       "^(?!.*\\.(js|jsx|css|json)$)": "<rootDir>/node_modules/react-scripts/config/jest/fileTransform.js"
     },
-    "transformIgnorePatterns": [
-      "[/\\\\]node_modules[/\\\\].+\\.(js|jsx)$"
-    ],
+    "transformIgnorePatterns": ["[/\\\\]node_modules[/\\\\].+\\.(js|jsx)$"],
     "rootDir": "."
   }
 }
diff --git a/packages/pseudo-json-ast/package.json b/packages/pseudo-json-ast/package.json
index e56781a9..f9a15aa2 100644
--- a/packages/pseudo-json-ast/package.json
+++ b/packages/pseudo-json-ast/package.json
@@ -18,9 +18,7 @@
   "jsnext:main": "dist/pseudo-json-ast.es.js",
   "module": "dist/pseudo-json-ast.es.js",
   "entry": "src/index.js",
-  "files": [
-    "dist"
-  ],
+  "files": ["dist"],
   "scripts": {
     "lint": "eslint . --fix",
     "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/pseudo-json-ast.xml",
@@ -56,9 +54,7 @@
   },
   "ava": {
     "tap": true,
-    "require": [
-      "babel-register"
-    ],
+    "require": ["babel-register"],
     "babel": "inherit"
   }
 }
diff --git a/packages/pseudo-yaml-ast/package.json b/packages/pseudo-yaml-ast/package.json
index 6194e05e..e6bf658f 100644
--- a/packages/pseudo-yaml-ast/package.json
+++ b/packages/pseudo-yaml-ast/package.json
@@ -20,9 +20,7 @@
   "jsnext:main": "dist/pseudo-yaml-ast.es.js",
   "module": "dist/pseudo-yaml-ast.es.js",
   "entry": "src/index.js",
-  "files": [
-    "dist"
-  ],
+  "files": ["dist"],
   "scripts": {
     "lint": "eslint . --fix",
     "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/pseudo-yaml-ast.xml",
@@ -58,9 +56,7 @@
   },
   "ava": {
     "tap": true,
-    "require": [
-      "babel-register"
-    ],
+    "require": ["babel-register"],
     "babel": "inherit"
   }
 }
diff --git a/packages/remcalc/package.json b/packages/remcalc/package.json
index 52a87850..06621610 100644
--- a/packages/remcalc/package.json
+++ b/packages/remcalc/package.json
@@ -3,14 +3,7 @@
   "version": "1.0.8",
   "license": "MPL-2.0",
   "description": "Calculate the `rem`'s from `px` values",
-  "keywords": [
-    "calc",
-    "rem",
-    "em",
-    "px",
-    "pixels",
-    "pixel"
-  ],
+  "keywords": ["calc", "rem", "em", "px", "pixels", "pixel"],
   "repository": "github:yldio/joyent-portal",
   "main": "dist/remcalc.umd.js",
   "jsnext:main": "dist/remcalc.es.js",
@@ -56,17 +49,13 @@
     ],
     "env": {
       "test": {
-        "plugins": [
-          "istanbul"
-        ]
+        "plugins": ["istanbul"]
       }
     }
   },
   "ava": {
     "tap": true,
-    "require": [
-      "babel-register"
-    ],
+    "require": ["babel-register"],
     "babel": "inherit"
   }
 }
diff --git a/packages/rnd-id/package.json b/packages/rnd-id/package.json
index 09f975e8..e9ba0a24 100644
--- a/packages/rnd-id/package.json
+++ b/packages/rnd-id/package.json
@@ -3,10 +3,7 @@
   "version": "1.0.8",
   "license": "MPL-2.0",
   "description": "Generate a random alpha string",
-  "keywords": [
-    "random",
-    "alphabetical"
-  ],
+  "keywords": ["random", "alphabetical"],
   "repository": "github:yldio/joyent-portal",
   "main": "dist/rnd-id.umd.js",
   "jsnext:main": "dist/rnd-id.es.js",
@@ -49,17 +46,13 @@
     ],
     "env": {
       "test": {
-        "plugins": [
-          "istanbul"
-        ]
+        "plugins": ["istanbul"]
       }
     }
   },
   "ava": {
     "tap": true,
-    "require": [
-      "babel-register"
-    ],
+    "require": ["babel-register"],
     "babel": "inherit"
   }
 }
diff --git a/packages/styled-is/package.json b/packages/styled-is/package.json
index b8019f91..6db84a3a 100644
--- a/packages/styled-is/package.json
+++ b/packages/styled-is/package.json
@@ -62,17 +62,13 @@
     ],
     "env": {
       "test": {
-        "plugins": [
-          "istanbul"
-        ]
+        "plugins": ["istanbul"]
       }
     }
   },
   "ava": {
     "tap": true,
-    "require": [
-      "babel-register"
-    ],
+    "require": ["babel-register"],
     "babel": "inherit"
   }
 }
diff --git a/packages/ui-toolkit/src/topology/data/big.json b/packages/ui-toolkit/src/topology/data/big.json
index 112d3c09..a2f5920c 100644
--- a/packages/ui-toolkit/src/topology/data/big.json
+++ b/packages/ui-toolkit/src/topology/data/big.json
@@ -1,961 +1,1212 @@
-[{
-  "uuid": "primary-consul",
-  "id": "consul",
-  "name": "Consul",
-  "instances": ["", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "isConsul": true,
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": "primary-nginx",
-  "id": "nginx",
-  "name": "Nginx",
-  "instances": [""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "connections": [
-    21393,
-    688632,
-    3802,
-    211054,
-    514555,
-    823837,
-    728066,
-    626040,
-    39531,
-    338897,
-    870461,
-    306578,
-    557611,
-    24764,
-    866947,
-    521183,
-    920500,
-    673424,
-    752876,
-    125936,
-    195071,
-    101278,
-    766252,
-    272044,
-    579947,
-    211151,
-    712793,
-    831906,
-    897694,
-    261116,
-    246274,
-    380300,
-    299558,
-    303216,
-    974334,
-    127763,
-    437955,
-    143274,
-    634968,
-    431609,
-    282549,
-    262582,
-    418482,
-    284724,
-    798952,
-    308763,
-    111726
-  ],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": "primary-mongodb",
-  "id": "mongodb",
-  "name": "MongoDB",
-  "instances": ["", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 21393,
-  "id": "accountservice",
-  "name": "AccountService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "connections": ["primary-mongodb"],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 688632,
-  "id": "addressservice",
-  "name": "AddressService",
-  "instances": ["", "", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 3802,
-  "id": "bloomreachservice",
-  "name": "BloomreachService",
-  "instances": ["", "", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 211054,
-  "id": "cartservice",
-  "name": "CartService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 514555,
-  "id": "extra service reported by containerpilot: cartservice-https",
-  "name": "Extra service reported by ContainerPilot: CartService-HTTPS",
-  "instances": ["", "", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 823837,
-  "id": "cctokenizationclientservice",
-  "name": "CCTokenizationClientService",
-  "instances": ["", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "connections": ["primary-mongodb"],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 728066,
-  "id": "checkoutservice",
-  "name": "CheckoutService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 626040,
-  "id": "colorswatchservice",
-  "name": "ColorSwatchService",
-  "instances": ["", "", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 39531,
-  "id": "emailmarketingservice",
-  "name": "EmailMarketingService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 338897,
-  "id": "favoriteservice",
-  "name": "FavoriteService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 870461,
-  "id": "findinstoreservice",
-  "name": "FindInStoreService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "connections": ["primary-mongodb"],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 306578,
-  "id": "fitpredictorservice",
-  "name": "FitpredictorService",
-  "instances": ["", "", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 557611,
-  "id": "hidefromcatalogservice",
-  "name": "HidefromcatalogService",
-  "instances": ["", "", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 24764,
-  "id": "internationalcheckoutservice",
-  "name": "InternationalCheckoutService",
-  "instances": ["", "", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 866947,
-  "id": "internationalposervice",
-  "name": "InternationalPOService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 521183,
-  "id": "internationalshippingservice",
-  "name": "InternationalShippingService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "connections": ["primary-mongodb"],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 920500,
-  "id": "inventoryservice",
-  "name": "InventoryService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 673424,
-  "id": "localizationservice",
-  "name": "LocalizationService",
-  "instances": ["", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 752876,
-  "id": "moreaccountservice",
-  "name": "MoreAccountService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 125936,
-  "id": "navigationservice",
-  "name": "NavigationService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 195071,
-  "id": "ordercreationjob",
-  "name": "OrderCreationJob",
-  "instances": ["", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "connections": ["primary-mongodb"],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 101278,
-  "id": "orderservice",
-  "name": "OrderService",
-  "instances": ["", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 766252,
-  "id": "orderservice",
-  "name": "OrderService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 272044,
-  "id": "paymentmethodservice",
-  "name": "PaymentMethodService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 579947,
-  "id": "paymentservice",
-  "name": "PaymentService",
-  "instances": ["", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 211151,
-  "id": "paymentservice",
-  "name": "PaymentService",
-  "instances": ["", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "connections": ["primary-mongodb"],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 712793,
-  "id": "priceservice",
-  "name": "PriceService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 831906,
-  "id": "privatesaleservice",
-  "name": "PrivatesaleService",
-  "instances": ["", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 897694,
-  "id": "productarrayservice",
-  "name": "ProductArrayService",
-  "instances": ["", "", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 261116,
-  "id": "productdetailservice",
-  "name": "ProductDetailService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 246274,
-  "id": "productservice",
-  "name": "ProductService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "connections": ["primary-mongodb"],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 380300,
-  "id": "profileservice",
-  "name": "ProfileService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 299558,
-  "id": "promoservice",
-  "name": "PromoService",
-  "instances": ["", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 303216,
-  "id": "promotionservice",
-  "name": "PromotionService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 974334,
-  "id": "questionanswerservice",
-  "name": "QuestionanswerService",
-  "instances": ["", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 127763,
-  "id": "redbaloonservice",
-  "name": "RedBaloonService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "connections": ["primary-mongodb"],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 437955,
-  "id": "extra service reported by containerpilot: redbaloonservice-https",
-  "name": "Extra service reported by ContainerPilot: RedBaloonService-HTTPS",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 143274,
-  "id": "reviewsservice",
-  "name": "ReviewsService",
-  "instances": ["", "", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 634968,
-  "id": "searchfacetsservice",
-  "name": "SearchFacetsService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 431609,
-  "id": "searchindexservice",
-  "name": "SearchIndexService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 282549,
-  "id": "shoprunnerservice",
-  "name": "ShopRunnerService",
-  "instances": ["", "", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "connections": ["primary-mongodb"],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 262582,
-  "id": "taxservice",
-  "name": "TaxService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 418482,
-  "id": "toggleservice",
-  "name": "ToggleService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 284724,
-  "id": "useraccountservice",
-  "name": "UserAccountService",
-  "instances": ["", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 798952,
-  "id": "userauthenticationservice",
-  "name": "UserAuthenticationService",
-  "instances": ["", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 308763,
-  "id": "waitlistoverlayservice",
-  "name": "WaitlistOverlayService",
-  "instances": ["", "", "", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "connections": ["primary-mongodb"],
-  "datacentres": 1,
-  "healthy": true
-}, {
-  "uuid": 111726,
-  "id": "waitlistservice",
-  "name": "WaitlistService",
-  "instances": ["", "", ""],
-  "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "datacentres": 1,
-  "healthy": true
-}]
+[
+  {
+    "uuid": "primary-consul",
+    "id": "consul",
+    "name": "Consul",
+    "instances": ["", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "isConsul": true,
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": "primary-nginx",
+    "id": "nginx",
+    "name": "Nginx",
+    "instances": [""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "connections": [
+      21393,
+      688632,
+      3802,
+      211054,
+      514555,
+      823837,
+      728066,
+      626040,
+      39531,
+      338897,
+      870461,
+      306578,
+      557611,
+      24764,
+      866947,
+      521183,
+      920500,
+      673424,
+      752876,
+      125936,
+      195071,
+      101278,
+      766252,
+      272044,
+      579947,
+      211151,
+      712793,
+      831906,
+      897694,
+      261116,
+      246274,
+      380300,
+      299558,
+      303216,
+      974334,
+      127763,
+      437955,
+      143274,
+      634968,
+      431609,
+      282549,
+      262582,
+      418482,
+      284724,
+      798952,
+      308763,
+      111726
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": "primary-mongodb",
+    "id": "mongodb",
+    "name": "MongoDB",
+    "instances": ["", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 21393,
+    "id": "accountservice",
+    "name": "AccountService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "connections": ["primary-mongodb"],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 688632,
+    "id": "addressservice",
+    "name": "AddressService",
+    "instances": ["", "", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 3802,
+    "id": "bloomreachservice",
+    "name": "BloomreachService",
+    "instances": ["", "", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 211054,
+    "id": "cartservice",
+    "name": "CartService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 514555,
+    "id": "extra service reported by containerpilot: cartservice-https",
+    "name": "Extra service reported by ContainerPilot: CartService-HTTPS",
+    "instances": ["", "", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 823837,
+    "id": "cctokenizationclientservice",
+    "name": "CCTokenizationClientService",
+    "instances": ["", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "connections": ["primary-mongodb"],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 728066,
+    "id": "checkoutservice",
+    "name": "CheckoutService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 626040,
+    "id": "colorswatchservice",
+    "name": "ColorSwatchService",
+    "instances": ["", "", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 39531,
+    "id": "emailmarketingservice",
+    "name": "EmailMarketingService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 338897,
+    "id": "favoriteservice",
+    "name": "FavoriteService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 870461,
+    "id": "findinstoreservice",
+    "name": "FindInStoreService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "connections": ["primary-mongodb"],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 306578,
+    "id": "fitpredictorservice",
+    "name": "FitpredictorService",
+    "instances": ["", "", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 557611,
+    "id": "hidefromcatalogservice",
+    "name": "HidefromcatalogService",
+    "instances": ["", "", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 24764,
+    "id": "internationalcheckoutservice",
+    "name": "InternationalCheckoutService",
+    "instances": ["", "", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 866947,
+    "id": "internationalposervice",
+    "name": "InternationalPOService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 521183,
+    "id": "internationalshippingservice",
+    "name": "InternationalShippingService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "connections": ["primary-mongodb"],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 920500,
+    "id": "inventoryservice",
+    "name": "InventoryService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 673424,
+    "id": "localizationservice",
+    "name": "LocalizationService",
+    "instances": ["", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 752876,
+    "id": "moreaccountservice",
+    "name": "MoreAccountService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 125936,
+    "id": "navigationservice",
+    "name": "NavigationService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 195071,
+    "id": "ordercreationjob",
+    "name": "OrderCreationJob",
+    "instances": ["", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "connections": ["primary-mongodb"],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 101278,
+    "id": "orderservice",
+    "name": "OrderService",
+    "instances": ["", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 766252,
+    "id": "orderservice",
+    "name": "OrderService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 272044,
+    "id": "paymentmethodservice",
+    "name": "PaymentMethodService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 579947,
+    "id": "paymentservice",
+    "name": "PaymentService",
+    "instances": ["", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 211151,
+    "id": "paymentservice",
+    "name": "PaymentService",
+    "instances": ["", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "connections": ["primary-mongodb"],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 712793,
+    "id": "priceservice",
+    "name": "PriceService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 831906,
+    "id": "privatesaleservice",
+    "name": "PrivatesaleService",
+    "instances": ["", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 897694,
+    "id": "productarrayservice",
+    "name": "ProductArrayService",
+    "instances": ["", "", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 261116,
+    "id": "productdetailservice",
+    "name": "ProductDetailService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 246274,
+    "id": "productservice",
+    "name": "ProductService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "connections": ["primary-mongodb"],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 380300,
+    "id": "profileservice",
+    "name": "ProfileService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 299558,
+    "id": "promoservice",
+    "name": "PromoService",
+    "instances": ["", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 303216,
+    "id": "promotionservice",
+    "name": "PromotionService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 974334,
+    "id": "questionanswerservice",
+    "name": "QuestionanswerService",
+    "instances": ["", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 127763,
+    "id": "redbaloonservice",
+    "name": "RedBaloonService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "connections": ["primary-mongodb"],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 437955,
+    "id": "extra service reported by containerpilot: redbaloonservice-https",
+    "name": "Extra service reported by ContainerPilot: RedBaloonService-HTTPS",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 143274,
+    "id": "reviewsservice",
+    "name": "ReviewsService",
+    "instances": ["", "", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 634968,
+    "id": "searchfacetsservice",
+    "name": "SearchFacetsService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 431609,
+    "id": "searchindexservice",
+    "name": "SearchIndexService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 282549,
+    "id": "shoprunnerservice",
+    "name": "ShopRunnerService",
+    "instances": ["", "", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "connections": ["primary-mongodb"],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 262582,
+    "id": "taxservice",
+    "name": "TaxService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 418482,
+    "id": "toggleservice",
+    "name": "ToggleService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 284724,
+    "id": "useraccountservice",
+    "name": "UserAccountService",
+    "instances": ["", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 798952,
+    "id": "userauthenticationservice",
+    "name": "UserAuthenticationService",
+    "instances": ["", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 308763,
+    "id": "waitlistoverlayservice",
+    "name": "WaitlistOverlayService",
+    "instances": ["", "", "", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "connections": ["primary-mongodb"],
+    "datacentres": 1,
+    "healthy": true
+  },
+  {
+    "uuid": 111726,
+    "id": "waitlistservice",
+    "name": "WaitlistService",
+    "instances": ["", "", ""],
+    "project": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "datacentres": 1,
+    "healthy": true
+  }
+]
diff --git a/packages/ui-toolkit/src/topology/data/wp.json b/packages/ui-toolkit/src/topology/data/wp.json
index f70e3f61..5e6facfe 100644
--- a/packages/ui-toolkit/src/topology/data/wp.json
+++ b/packages/ui-toolkit/src/topology/data/wp.json
@@ -1,118 +1,147 @@
-[{
-  "uuid": "081a792c-47e0-4439-924b-2efa9788ae9e",
-  "id": "nginx",
-  "name": "Nginx",
-  "project": "e0ea0c02-55cc-45fe-8064-3e5176a59401",
-  "instances": [""],
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "connections": [
-    "be227788-74f1-4e5b-a85f-b5c71cbae8d8"
-  ],
-  "healthy": true,
-  "datacentres": 1
-}, {
-  "uuid": "be227788-74f1-4e5b-a85f-b5c71cbae8d8",
-  "id": "wordpress",
-  "name": "Wordpress",
-  "project": "e0ea0c02-55cc-45fe-8064-3e5176a59401",
-  "instances": ["", ""],
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "connections": [
-    "6a0eee76-c019-413b-9d5f-44712b55b993",
-    "6d31aff4-de1e-4042-a983-fbd23d5c530c",
-    "4ee4103e-1a52-4099-a48e-01588f597c70"
-  ],
-  "healthy": true,
-  "datacentres": 2
-}, {
-  "uuid": "6a0eee76-c019-413b-9d5f-44712b55b993",
-  "id": "nfs",
-  "name": "NFS",
-  "project": "e0ea0c02-55cc-45fe-8064-3e5176a59401",
-  "instances": ["", ""],
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "healthy": true,
-  "datacentres": 2
-}, {
-  "uuid": "6d31aff4-de1e-4042-a983-fbd23d5c530c",
-  "id": "memcached",
-  "name": "Memcached",
-  "project": "e0ea0c02-55cc-45fe-8064-3e5176a59401",
-  "instances": ["", ""],
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "healthy": true,
-  "datacentres": 2
-}, {
-  "uuid": "4ee4103e-1a52-4099-a48e-01588f597c70",
-  "id": "percona",
-  "name": "Percona",
-  "project": "e0ea0c02-55cc-45fe-8064-3e5176a59401",
-  "instances": ["", ""],
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "healthy": true,
-  "datacentres": 1
-}, {
-  "uuid": "97c68055-db88-45c9-ad49-f26da4264777",
-  "id": "consul",
-  "name": "Consul",
-  "project": "e0ea0c02-55cc-45fe-8064-3e5176a59401",
-  "instances": ["", ""],
-  "isConsul": true,
-  "metrics": [{
-    "name": "CPU",
-    "value": "50%"
-  }, {
-    "name": "Memory",
-    "value": "20%"
-  }, {
-    "name": "Network",
-    "value": "2.9Kb/sec"
-  }],
-  "healthy": true,
-  "datacentres": 2
-}]
+[
+  {
+    "uuid": "081a792c-47e0-4439-924b-2efa9788ae9e",
+    "id": "nginx",
+    "name": "Nginx",
+    "project": "e0ea0c02-55cc-45fe-8064-3e5176a59401",
+    "instances": [""],
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "connections": ["be227788-74f1-4e5b-a85f-b5c71cbae8d8"],
+    "healthy": true,
+    "datacentres": 1
+  },
+  {
+    "uuid": "be227788-74f1-4e5b-a85f-b5c71cbae8d8",
+    "id": "wordpress",
+    "name": "Wordpress",
+    "project": "e0ea0c02-55cc-45fe-8064-3e5176a59401",
+    "instances": ["", ""],
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "connections": [
+      "6a0eee76-c019-413b-9d5f-44712b55b993",
+      "6d31aff4-de1e-4042-a983-fbd23d5c530c",
+      "4ee4103e-1a52-4099-a48e-01588f597c70"
+    ],
+    "healthy": true,
+    "datacentres": 2
+  },
+  {
+    "uuid": "6a0eee76-c019-413b-9d5f-44712b55b993",
+    "id": "nfs",
+    "name": "NFS",
+    "project": "e0ea0c02-55cc-45fe-8064-3e5176a59401",
+    "instances": ["", ""],
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "healthy": true,
+    "datacentres": 2
+  },
+  {
+    "uuid": "6d31aff4-de1e-4042-a983-fbd23d5c530c",
+    "id": "memcached",
+    "name": "Memcached",
+    "project": "e0ea0c02-55cc-45fe-8064-3e5176a59401",
+    "instances": ["", ""],
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "healthy": true,
+    "datacentres": 2
+  },
+  {
+    "uuid": "4ee4103e-1a52-4099-a48e-01588f597c70",
+    "id": "percona",
+    "name": "Percona",
+    "project": "e0ea0c02-55cc-45fe-8064-3e5176a59401",
+    "instances": ["", ""],
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "healthy": true,
+    "datacentres": 1
+  },
+  {
+    "uuid": "97c68055-db88-45c9-ad49-f26da4264777",
+    "id": "consul",
+    "name": "Consul",
+    "project": "e0ea0c02-55cc-45fe-8064-3e5176a59401",
+    "instances": ["", ""],
+    "isConsul": true,
+    "metrics": [
+      {
+        "name": "CPU",
+        "value": "50%"
+      },
+      {
+        "name": "Memory",
+        "value": "20%"
+      },
+      {
+        "name": "Network",
+        "value": "2.9Kb/sec"
+      }
+    ],
+    "healthy": true,
+    "datacentres": 2
+  }
+]
diff --git a/packages/unitcalc/package.json b/packages/unitcalc/package.json
index 2ae79c7e..6c42b077 100644
--- a/packages/unitcalc/package.json
+++ b/packages/unitcalc/package.json
@@ -57,17 +57,13 @@
     ],
     "env": {
       "test": {
-        "plugins": [
-          "istanbul"
-        ]
+        "plugins": ["istanbul"]
       }
     }
   },
   "ava": {
     "tap": true,
-    "require": [
-      "babel-register"
-    ],
+    "require": ["babel-register"],
     "babel": "inherit"
   }
 }