diff --git a/gatsby-config.js b/gatsby-config.js
index cb33344c791e0a11a38e40643f8f24b0aad437fc..f3bdbfa14d939e17c03389c1cb3839a11a2f42a4 100644
--- a/gatsby-config.js
+++ b/gatsby-config.js
@@ -1,8 +1,8 @@
 module.exports = {
   siteMetadata: {
     title: `AF Enterprise Digital Transformation Services`,
-    description: `TODO: Add Description`,
-    author: `TODO: Add Autor`,
+    description: `C3I&N enables digital transformation across the U.S. Air Force. Explore our Networking, Compute & Store and DevSecOps services and more.`,
+    image: `/src/images/usaf-logo.png`,
   },
   plugins: [
     `gatsby-plugin-react-helmet`,
diff --git a/gatsby-node.js b/gatsby-node.js
index 01152ce6f23875138728f34e86a9e0ffb3cd10bd..f5c9e7bd0fadd7bcca3bea591d77b2f9ba43c0af 100644
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -18,6 +18,11 @@ exports.createPages = async (gatsbyNodeHelpers) => {
     './src/templates/Generic.js',
     '/generic/'
   );
+  await mdPagesFromTemplate(
+    gatsbyNodeHelpers,
+    './src/templates/SolutionDetail.js',
+    '/content/solutions/'
+  );
 };
 
 /**
diff --git a/src/components/Classification.js b/src/components/Classification.js
index 809b2385daff4dafc9a6c8c148e15688585ae7a8..b4a066b32a10cb25b11bd45d3cd8e8a6874c3b50 100644
--- a/src/components/Classification.js
+++ b/src/components/Classification.js
@@ -50,23 +50,23 @@ const Classification = ({ levels }) => (
         flex="grow"
         border={{ size: 'xsmall', side: 'top', color: 'light-1' }}
       >
-        <LevelNode levels={levels} value="Unclass">
-          U
+        <LevelNode levels={levels} value="U">
+          CUI
         </LevelNode>
-        <LevelNode levels={levels} value="SEC-COLL">
+        <LevelNode levels={levels} value="S">
           S
         </LevelNode>
-        <LevelNode levels={levels} value="SEC-SAP">
-          S//Sar
+        <LevelNode levels={levels} value="S-SAR">
+          S//SAR
         </LevelNode>
-        <LevelNode levels={levels} value="SEC-SCI">
+        <LevelNode levels={levels} value="S-SCI">
           S//SCI
         </LevelNode>
-        <LevelNode levels={levels} value="TS-COLL">
-          TS//Col
+        <LevelNode levels={levels} value="TS">
+          TS
         </LevelNode>
-        <LevelNode levels={levels} value="TS-SAP">
-          TS//SAP
+        <LevelNode levels={levels} value="TS-SAR">
+          TS//SAR
         </LevelNode>
         <LevelNode levels={levels} value="TS-SCI">
           TS//SCI
@@ -78,12 +78,12 @@ const Classification = ({ levels }) => (
 
 Classification.propTypes = {
   level: PropTypes.arrayOf([
-    'Unclass',
-    'SEC-COLL',
-    'SEC-SAP',
-    'SEC-SCI',
-    'TS-COLL',
-    'TS-SAP',
+    'U',
+    'S',
+    'S-SAR',
+    'S-SCI',
+    'TSS',
+    'TS-SAR',
     'TS-SCI',
   ]),
 };
diff --git a/src/components/DownHex.js b/src/components/DownHex.js
new file mode 100644
index 0000000000000000000000000000000000000000..4a817664f6dcb0f6a0daaaae278d1f1dc6e73d0e
--- /dev/null
+++ b/src/components/DownHex.js
@@ -0,0 +1,42 @@
+import React from 'react';
+import { Box } from 'grommet';
+import { FormDown } from 'grommet-icons';
+import { Column } from './layout';
+import { DtHex } from './icons';
+
+const DownHex = () => (
+  <Box
+    style={{ position: 'absolute', bottom: 0, left: 0, right: 0 }}
+    align="center"
+  >
+    <Column align="start" direction="row">
+      <Box
+        pad="small"
+        width="80px"
+        height="35px"
+        align="center"
+        justify="center"
+        style={{ position: 'relative', overflow: 'hidden' }}
+      >
+        <DtHex
+          color="white"
+          size="80"
+          style={{
+            position: 'absolute',
+            top: '0',
+            left: '0',
+            right: '0',
+            bottom: '0',
+          }}
+        />
+        <FormDown
+          color="accent-1"
+          size="30"
+          style={{ position: 'relative', top: '7px' }}
+        />
+      </Box>
+    </Column>
+  </Box>
+);
+
+export default DownHex;
diff --git a/src/components/FeedbackFooter.js b/src/components/FeedbackFooter.js
new file mode 100644
index 0000000000000000000000000000000000000000..c454baae0d9787d98d0d9e65f171fbecfabdf25f
--- /dev/null
+++ b/src/components/FeedbackFooter.js
@@ -0,0 +1,35 @@
+import React, { useContext } from 'react';
+import { Box, Text, ResponsiveContext } from 'grommet';
+import { Container, Column } from './layout';
+import { SecondaryButton } from './core';
+
+const FeedbackFooter = () => {
+  const size = useContext(ResponsiveContext);
+  const isMobile = ['xsmall', 'small'].includes(size);
+
+  return (
+    <Container border={{ side: 'top', color: 'light-1' }}>
+      <Column>
+        <Box
+          direction={isMobile ? 'column' : 'row'}
+          justify="center"
+          pad="medium"
+          gap="medium"
+        >
+          <Box justify="center" align={isMobile ? 'center' : 'start'}>
+            <Text weight="bold">We could use your feedback!</Text>
+            <Text size="small">Help us improve this service.</Text>
+          </Box>
+          <Box border={{ side: 'right', size: 'small', color: 'light-1' }} />
+          <Box justify="center" align="center">
+            <Box width="200px">
+              <SecondaryButton label="SEND FEEDBACK" />
+            </Box>
+          </Box>
+        </Box>
+      </Column>
+    </Container>
+  );
+};
+
+export default FeedbackFooter;
diff --git a/src/components/app/AppLayout.js b/src/components/app/AppLayout.js
index 6fa9e4426a4f873f8fb5270b2394e321864992ee..3bd7c532c801842773c4def3b2dee7576f893c60 100644
--- a/src/components/app/AppLayout.js
+++ b/src/components/app/AppLayout.js
@@ -4,21 +4,23 @@ import { Grommet, Box, Main } from 'grommet';
 import { Helmet } from 'react-helmet';
 import Header from './Header';
 import Footer from './Footer';
+import FeedbackFooter from '../FeedbackFooter';
 import DebugController from '../DebugController';
 import DebugResponsive from '../DebugResponsive';
 import theme from '../../styles/theme';
 import '../../styles/global.css';
 
-const AppLayout = ({ children, isHome }) => (
+const AppLayout = ({ children, transparentHeader }) => (
   <Grommet theme={theme}>
     <DebugController>
       <Helmet>
         {/* Korolev font */}
         <link rel="stylesheet" href="https://use.typekit.net/hap3fxx.css" />
       </Helmet>
-      <Header isHome={isHome} />
+      <Header transparent={transparentHeader} />
       <Box>
         <Main>{children}</Main>
+        <FeedbackFooter />
         <Footer />
       </Box>
       <DebugResponsive />
@@ -28,7 +30,7 @@ const AppLayout = ({ children, isHome }) => (
 
 AppLayout.propTypes = {
   children: PropTypes.node.isRequired,
-  isHome: PropTypes.bool,
+  transparentHeader: PropTypes.bool,
 };
 
 export default AppLayout;
diff --git a/src/components/app/Footer.js b/src/components/app/Footer.js
index bae986ba304b7a3fd29bfbf93748904537cf693f..1497558852bda3fb4762be9b569c4faa23773519 100644
--- a/src/components/app/Footer.js
+++ b/src/components/app/Footer.js
@@ -1,28 +1,45 @@
-import React from 'react';
-import { Box, Text } from 'grommet';
+import React, { useContext } from 'react';
+import { Box, ResponsiveContext } from 'grommet';
 import { Container, Column } from '../layout';
+import { Link } from '../core';
 import AFLogo from '../../images/af-logo.svg';
 import C3Logo from '../../images/c3.png';
 
-const Footer = () => (
-  <Container as="footer" background="background-contrast" justify="end">
-    <Column>
-      <Box pad={{ vertical: 'large' }} justify="between" direction="row">
-        <Box gap="medium" justify="center">
-          <Text color="light-1" size="small" weight="bold">
-            About Us
-          </Text>
-          <Text color="light-1" size="small" weight="bold">
-            Help us improve by sharing your feedback
-          </Text>
-        </Box>
-        <Box direction="row" gap="medium">
-          <img src={C3Logo} width="117" height="117" alt="C3I&N" />
-          <AFLogo height="117" />
+const Footer = () => {
+  const size = useContext(ResponsiveContext);
+
+  const isMobile = ['xsmall', 'small'].includes(size);
+
+  return (
+    <Container as="footer" background="background-contrast" justify="end">
+      <Column>
+        <Box
+          pad={{ vertical: 'large' }}
+          justify="between"
+          direction={isMobile ? 'column' : 'row'}
+          gap="large"
+        >
+          <Box
+            gap="medium"
+            justify="center"
+            align={isMobile ? 'center' : 'start'}
+          >
+            <Link to="/about-us" color="light-1" size="small" weight="bold">
+              About Us
+            </Link>
+          </Box>
+          <Box
+            direction={isMobile ? 'column' : 'row'}
+            gap="medium"
+            align="center"
+          >
+            <img src={C3Logo} width="117" height="117" alt="C3I&N" />
+            <AFLogo height="117" />
+          </Box>
         </Box>
-      </Box>
-    </Column>
-  </Container>
-);
+      </Column>
+    </Container>
+  );
+};
 
 export default Footer;
diff --git a/src/components/app/Header.js b/src/components/app/Header.js
index 2e43968c85673482f3bf67ae30eb44d305e4062c..02850cf0c5005a98640d85819dc8a6c24452aa29 100644
--- a/src/components/app/Header.js
+++ b/src/components/app/Header.js
@@ -1,7 +1,7 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
 import { Link } from 'gatsby';
-import { Box, Text, Header as GHeader } from 'grommet';
+import { Box, Text, Header as GHeader, ResponsiveContext } from 'grommet';
 import styled from 'styled-components';
 import { RenderPropSticky as Sticky } from 'react-sticky-el';
 import { Container, Column } from '../layout';
@@ -20,71 +20,86 @@ const StyledHeader = styled(GHeader)`
   left: 0;
   right: 0;
   background: ${(props) =>
-    props.isHome && !props.sticky
+    props.transparent && !props.sticky
       ? 'linear-gradient(rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0))'
       : 'black'};
   display: flex;
   height: ${(props) =>
-    props.sticky
+    props.sticky || props.isMobile
       ? theme.custom.header.stickyHeight
       : theme.custom.header.height};
 `;
 
-const Header = ({ isHome }) => (
-  <Sticky topOffset={30}>
-    {({ isFixed, wrapperStyles, wrapperRef, holderStyles, holderRef }) => (
-      <div ref={holderRef} style={{ holderStyles }}>
-        <div
-          ref={wrapperRef}
-          style={isFixed ? { ...wrapperStyles, ...{ zIndex: 10 } } : {}}
-        >
-          <StyledHeader sticky={isFixed} isHome={isHome} background="black">
-            <Container>
-              <Column>
-                <Box direction="row" justify="between" flex="grow">
-                  <Box justify="center">
-                    <Link
-                      to="/"
-                      style={{
-                        textDecoration: `none`,
-                        fontSize: 12,
-                        display: 'flex',
-                        flexDirection: 'row',
-                      }}
-                    >
-                      <Box as="span" direction="row" align="center" gap="small">
-                        <AFLogo height={isFixed ? 45 : 55} />
-                        {!isFixed && (
-                          <Text
-                            color="white"
-                            size="small"
-                            style={{
-                              textTransform: 'uppercase',
-                              lineHeight: '1em',
-                            }}
-                            weight="bold"
-                          >
-                            AF Enterprise Digital
-                            <br />
-                            Transformation Services
-                          </Text>
-                        )}
-                      </Box>
-                    </Link>
+const Header = ({ transparent }) => {
+  const size = useContext(ResponsiveContext);
+  const isMobile = ['xsmall', 'small'].includes(size);
+  return (
+    <Sticky topOffset={30}>
+      {({ isFixed, wrapperStyles, wrapperRef, holderStyles, holderRef }) => (
+        <div ref={holderRef} style={{ holderStyles }}>
+          <div
+            ref={wrapperRef}
+            style={isFixed ? { ...wrapperStyles, ...{ zIndex: 10 } } : {}}
+          >
+            <StyledHeader
+              sticky={isFixed}
+              transparent={transparent}
+              isMobile={isMobile}
+              background="black"
+            >
+              <Container>
+                <Column>
+                  <Box direction="row" justify="between" flex="grow">
+                    <Box justify="center">
+                      <Link
+                        to="/"
+                        style={{
+                          textDecoration: `none`,
+                          fontSize: 12,
+                          display: 'flex',
+                          flexDirection: 'row',
+                        }}
+                      >
+                        <Box
+                          as="span"
+                          direction="row"
+                          align="center"
+                          gap="small"
+                        >
+                          <AFLogo height={isFixed || isMobile ? 45 : 55} />
+                          {!isFixed && !isMobile && (
+                            <Text
+                              color="white"
+                              size="small"
+                              style={{
+                                textTransform: 'uppercase',
+                                lineHeight: '1em',
+                              }}
+                              weight="bold"
+                            >
+                              AF Enterprise Digital
+                              <br />
+                              Transformation Services
+                            </Text>
+                          )}
+                        </Box>
+                      </Link>
+                    </Box>
+                    <Nav sticky={isFixed} />
                   </Box>
-                  <Nav sticky={isFixed} />
-                </Box>
-              </Column>
-            </Container>
-          </StyledHeader>
+                </Column>
+              </Container>
+            </StyledHeader>
+          </div>
         </div>
-      </div>
-    )}
-  </Sticky>
-);
+      )}
+    </Sticky>
+  );
+};
 
 Header.propTypes = {
   isHome: PropTypes.bool,
+  transparent: PropTypes.bool,
 };
 
 export default Header;
diff --git a/src/components/app/Nav.js b/src/components/app/Nav.js
index 8d87a8321ff6f03a945cc384566439482cdae958..98f960e62828da11a2a361a463040a84a1fabc68 100644
--- a/src/components/app/Nav.js
+++ b/src/components/app/Nav.js
@@ -1,11 +1,22 @@
-import React, { useState } from 'react';
-import { Box, Button, Text, Keyboard, ThemeContext } from 'grommet';
+import React, { useState, useContext } from 'react';
+import {
+  Box,
+  Button,
+  Keyboard,
+  Layer,
+  ThemeContext,
+  ResponsiveContext,
+} from 'grommet';
+import { Menu } from 'grommet-icons';
 import { Link } from '../core';
-import { MegaMenu } from '../mega-menu';
+import { MegaMenu, MegaMobileMenu } from '../mega-menu';
 
 const Nav = ({ sticky }) => {
   const [menuOpen, setMenuOpen] = useState(false);
 
+  const size = useContext(ResponsiveContext);
+  const isMobile = ['xsmall', 'small'].includes(size);
+
   const handleToggleMenu = (e) => {
     setMenuOpen(!menuOpen);
     e.preventDefault();
@@ -13,65 +24,74 @@ const Nav = ({ sticky }) => {
 
   return (
     <>
-      <Box
-        as="nav"
-        justify="center"
-        gap="medium"
-        direction={sticky ? 'row' : 'column'}
-      >
-        <Box direction="row" justify="end" gap="large">
-          <Box justify="center">
-            <Link
-              to="/about-us"
-              size="xsmall"
-              color="white"
-              style={{ textTransform: 'uppercase' }}
-            >
-              About Us
-            </Link>
-          </Box>
-          <Box justify="center">
-            <Link
-              to="/other-programs"
-              size="xsmall"
-              color="white"
-              style={{ textTransform: 'uppercase' }}
-            >
-              Our Other Programs
-            </Link>
-          </Box>
-        </Box>
-        <Box direction="row" justify="end" gap="large">
-          <Box justify="center">
-            <ThemeContext.Extend value={{}}>
-              <Button
-                onClick={handleToggleMenu}
-                secondary
-                color={menuOpen ? 'black' : 'white'}
+      {isMobile && <Button icon={<Menu />} onClick={handleToggleMenu} />}
+      {!isMobile && (
+        <Box
+          as="nav"
+          justify="center"
+          gap="medium"
+          direction={sticky ? 'row' : 'column'}
+        >
+          <Box direction="row" justify="end" gap="large">
+            <Box justify="center">
+              <Link
+                to="/about-us"
+                size="xsmall"
+                color="white"
                 style={{ textTransform: 'uppercase' }}
-                size="small"
-                label="Available Services"
-              />
-            </ThemeContext.Extend>
+              >
+                About Us
+              </Link>
+            </Box>
+            <Box justify="center">
+              <Link
+                to="/other-programs"
+                size="xsmall"
+                color="white"
+                style={{ textTransform: 'uppercase' }}
+              >
+                Our Other Programs
+              </Link>
+            </Box>
           </Box>
-          <Box justify="center">
-            <Text
-              color="white"
-              weight="bold"
-              pad="small"
-              size="small"
-              style={{ textTransform: 'uppercase' }}
-            >
-              Solutions
-            </Text>
+          <Box direction="row" justify="end" gap="large">
+            <Box justify="center">
+              <ThemeContext.Extend value={{}}>
+                <Button
+                  onClick={handleToggleMenu}
+                  secondary
+                  color={menuOpen ? 'black' : 'white'}
+                  style={{ textTransform: 'uppercase' }}
+                  size="small"
+                  label="Available Services"
+                />
+              </ThemeContext.Extend>
+            </Box>
+            <Box justify="center">
+              <Link
+                to="/solutions"
+                size="small"
+                weight="bold"
+                color="white"
+                style={{ textTransform: 'uppercase' }}
+              >
+                Solutions
+              </Link>
+            </Box>
           </Box>
         </Box>
-      </Box>
-      {menuOpen && (
+      )}
+
+      {menuOpen && !isMobile && (
         <Keyboard target="document" onEsc={handleToggleMenu}>
           <MegaMenu sticky={sticky} />
         </Keyboard>
       )}
+      {menuOpen && isMobile && (
+        <Layer full onClickOutside={handleToggleMenu} onEsc={handleToggleMenu}>
+          <MegaMobileMenu onClose={handleToggleMenu} />
+        </Layer>
+      )}
     </>
   );
 };
diff --git a/src/components/app/SEO.js b/src/components/app/SEO.js
index dda8833cbe0962931be3f58a7c5d8fb3e9a8fd7f..5a1e465717d582ec8e6e3810e4a1266a9e52b2b6 100644
--- a/src/components/app/SEO.js
+++ b/src/components/app/SEO.js
@@ -5,12 +5,12 @@
  * See: https://www.gatsbyjs.com/docs/use-static-query/
  */
 
-import React from "react"
-import PropTypes from "prop-types"
-import { Helmet } from "react-helmet"
-import { useStaticQuery, graphql } from "gatsby"
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Helmet } from 'react-helmet';
+import { useStaticQuery, graphql } from 'gatsby';
 
-function SEO({ description, lang, meta, title }) {
+function SEO({ description, lang, meta, title, image }) {
   const { site } = useStaticQuery(
     graphql`
       query {
@@ -18,15 +18,16 @@ function SEO({ description, lang, meta, title }) {
           siteMetadata {
             title
             description
-            author
+            image
           }
         }
       }
     `
-  )
+  );
 
-  const metaDescription = description || site.siteMetadata.description
-  const defaultTitle = site.siteMetadata?.title
+  const metaDescription = description || site.siteMetadata.description;
+  const defaultTitle = site.siteMetadata.title;
+  const shareImage = image || site.siteMetadata.image;
 
   return (
     <Helmet
@@ -34,7 +35,7 @@ function SEO({ description, lang, meta, title }) {
         lang,
       }}
       title={title}
-      titleTemplate={defaultTitle ? `%s | ${defaultTitle}` : null}
+      titleTemplate={title ? `%s | ${defaultTitle}` : null}
       meta={[
         {
           name: `description`,
@@ -53,12 +54,12 @@ function SEO({ description, lang, meta, title }) {
           content: `website`,
         },
         {
-          name: `twitter:card`,
-          content: `summary`,
+          property: `og:image`,
+          content: shareImage,
         },
         {
-          name: `twitter:creator`,
-          content: site.siteMetadata?.author || ``,
+          name: `twitter:card`,
+          content: `summary`,
         },
         {
           name: `twitter:title`,
@@ -70,20 +71,20 @@ function SEO({ description, lang, meta, title }) {
         },
       ].concat(meta)}
     />
-  )
+  );
 }
 
 SEO.defaultProps = {
   lang: `en`,
   meta: [],
   description: ``,
-}
+};
 
 SEO.propTypes = {
   description: PropTypes.string,
   lang: PropTypes.string,
   meta: PropTypes.arrayOf(PropTypes.object),
-  title: PropTypes.string.isRequired,
-}
+  title: PropTypes.string,
+};
 
-export default SEO
+export default SEO;
diff --git a/src/components/core/SecondaryButton.js b/src/components/core/SecondaryButton.js
new file mode 100644
index 0000000000000000000000000000000000000000..ff7ca254d0802e8e0fbc77f9f72d43abfe073081
--- /dev/null
+++ b/src/components/core/SecondaryButton.js
@@ -0,0 +1,23 @@
+import React from 'react';
+import { Button } from 'grommet';
+import { FormNext } from 'grommet-icons';
+
+/**
+ * Application specific button component, using Grommet Button
+ * @see https://v2.grommet.io/button
+ * @param {object} props - React props
+ * @returns {Component}
+ */
+const SecondaryButton = ({ ...rest }) => (
+  <Button
+    secondary
+    color="dark-1"
+    style={{ textTransform: 'uppercase' }}
+    icon={<FormNext color="accent-1" />}
+    reverse
+    size="small"
+    {...rest}
+  />
+);
+
+export default SecondaryButton;
diff --git a/src/components/core/index.js b/src/components/core/index.js
index e8738d5825e7a281654676b3a34c7e0e4643d95e..764928d8304e7f29a62e8254290fa4d353f0dc72 100644
--- a/src/components/core/index.js
+++ b/src/components/core/index.js
@@ -1,3 +1,4 @@
 export { default as Link } from './Link';
 export { default as Markdown } from './Markdown';
 export { default as PrimaryButton } from './PrimaryButton';
+export { default as SecondaryButton } from './SecondaryButton';
diff --git a/src/components/hero/Hero.js b/src/components/hero/Hero.js
index 1bb159d3281442e4d583eb75e0d4d2d979954c08..8f89f273688099937f74feab3125d025bbe6e12a 100644
--- a/src/components/hero/Hero.js
+++ b/src/components/hero/Hero.js
@@ -3,6 +3,7 @@ import { useStaticQuery, graphql } from 'gatsby';
 import Img from 'gatsby-image';
 import { Box, Heading, Text, ThemeContext } from 'grommet';
 import { FormPrevious } from 'grommet-icons';
+import DownHex from '../DownHex';
 import { Container, Column } from '../layout';
 import { PrimaryButton } from '../core';
 
@@ -152,6 +153,7 @@ const Hero = () => {
           </Box>
         ))}
       </Box>
+      <DownHex />
     </Box>
   );
 };
diff --git a/src/components/hero/ServiceCatHero.js b/src/components/hero/ServiceCatHero.js
index fe85af275b401441640654cd2cd3d7fafe7ec474..e41d412fecfc0eedcf12740f41e5aa2c90b39863 100644
--- a/src/components/hero/ServiceCatHero.js
+++ b/src/components/hero/ServiceCatHero.js
@@ -1,57 +1,93 @@
-import React from 'react';
-import { Box, Heading } from 'grommet';
+import React, { useContext } from 'react';
 import Img from 'gatsby-image';
-import { FormDown, Cluster } from 'grommet-icons';
+import { Box, Heading, Text, ResponsiveContext } from 'grommet';
+import * as dtIcons from '../icons';
 import { Container, Column } from '../layout';
 import { Markdown } from '../core';
+import DownHex from '../DownHex';
 import theme from '../../styles/theme';
 
-const ServiceCatHero = ({ title, description, imageFluid }) => (
-  <Container
-    background="accent-3"
-    style={{ position: 'relative' }}
-    pad={{ top: theme.custom.header.height }}
-  >
-    <Img
-      fluid={imageFluid}
-      alt="Hero"
-      style={{
-        position: 'absolute',
-        top: '0',
-        left: '0',
-        right: '0',
-        bottom: '0',
+const ServiceCatHero = ({ title, description, imageFluid, iconName }) => {
+  const size = useContext(ResponsiveContext);
+  const IconComponent = dtIcons[iconName];
+
+  const isMobile = ['xsmall', 'small'].includes(size);
+
+  return (
+    <Container
+      background="black"
+      style={{ position: 'relative' }}
+      pad={{
+        top: isMobile
+          ? theme.custom.header.stickyHeight
+          : theme.custom.header.height,
       }}
-    />
+    >
+      {!isMobile && (
+        <Img
+          fluid={imageFluid}
+          alt="Hero"
+          style={{
+            position: 'absolute',
+            top: '0',
+            left: '0',
+            right: '0',
+            bottom: '0',
+          }}
+        />
+      )}
+
+      <Column>
+        <Box
+          pad={{ vertical: 'large' }}
+          direction="row"
+          style={{ position: 'relative' }}
+        >
+          <Box
+            background={isMobile ? 'none' : 'black'}
+            pad="medium"
+            style={{ zIndex: 5 }}
+          >
+            <Text size="small" color="accent-2">
+              AVAILABLE SERVICES
+            </Text>
 
-    <Column>
-      <Box
-        pad={{ vertical: 'medium' }}
-        direction="row"
-        style={{ position: 'relative' }}
-      >
-        <Box background="black" pad="medium">
-          <Box>
-            <Heading level={1} margin="none">
+            <Heading level={1} margin={{ vertical: 'small' }}>
               {title}
             </Heading>
+            <Box width={isMobile ? 'auto' : '500px'}>
+              {description && <Markdown>{description}</Markdown>}
+            </Box>
           </Box>
-          <Box width="500px">
-            {description && <Markdown>{description}</Markdown>}
-          </Box>
-        </Box>
-        <Box pad="medium" align="center" justify="center" flex={{ grow: 1 }}>
-          <Cluster size="100%" />
+          {!isMobile && (
+            <Box
+              pad={{ horizontal: 'medium' }}
+              align="center"
+              justify="center"
+              gap="medium"
+              flex={{ grow: 1 }}
+            >
+              <IconComponent size="300" color={isMobile ? 'dark-4' : 'white'} />
+            </Box>
+          )}
         </Box>
-      </Box>
-    </Column>
+        {isMobile && (
+          <IconComponent
+            size="300"
+            color="dark-4"
+            style={{
+              position: 'fixed',
+              right: '-150px',
+              top: '100px',
+              zIndex: 2,
+            }}
+          />
+        )}
+      </Column>
 
-    <Column align="start" direction="row" style={{ position: 'relative' }}>
-      <Box background="white" pad="small">
-        <FormDown color="accent-1" />
-      </Box>
-    </Column>
-  </Container>
-);
+      <DownHex />
+    </Container>
+  );
+};
 
 export default ServiceCatHero;
diff --git a/src/components/hero/ServiceHero.js b/src/components/hero/ServiceHero.js
index 24ccd0e2b7ff5a70b851f44a5fb9c03f5625d7ed..3b7d698d9955fa8dd2b6bfdd2bcf9f2f11107017 100644
--- a/src/components/hero/ServiceHero.js
+++ b/src/components/hero/ServiceHero.js
@@ -1,37 +1,64 @@
-import React from 'react';
-import { Box, Heading } from 'grommet';
-import { Nodes, FormDown } from 'grommet-icons';
+import React, { useContext } from 'react';
+import Img from 'gatsby-image';
+import { Box, Heading, Text, ResponsiveContext } from 'grommet';
 import { Container, Column } from '../layout';
+import DownHex from '../DownHex';
 import theme from '../../styles/theme';
 
 const addDivider = (arr, divider) =>
   [].concat(...arr.map((n) => [n, divider])).slice(0, -1);
 
-const ServiceHero = ({ title, categories }) => {
+const ServiceHero = ({ title, subtitle, pretitle, categories, imageFluid }) => {
+  const size = useContext(ResponsiveContext);
+
+  const isMobile = ['xsmall', 'small'].includes(size);
+
   const catWithDivider = categories && addDivider(categories, '|');
 
   return (
-    <Container background="accent-3" pad={{ top: theme.custom.header.height }}>
-      <Column direction="row">
-        <Box pad="medium">
+    <Container
+      background="black"
+      style={{ position: 'relative' }}
+      pad={{ top: theme.custom.header.height }}
+    >
+      {!isMobile && (
+        <Img
+          fluid={imageFluid}
+          alt="Hero"
+          style={{
+            position: 'absolute',
+            top: '0',
+            left: '0',
+            right: '0',
+            bottom: '0',
+          }}
+        />
+      )}
+      <Column
+        direction="row"
+        pad={{ vertical: 'large' }}
+        style={{ position: 'relative' }}
+      >
+        <Box pad="large">
+          {pretitle && <Text color="accent-2">{pretitle}</Text>}
+          <Heading level={1} as="h1" margin="none">
+            {title}
+          </Heading>
           <Box direction="row" align="center" gap="small">
-            <Nodes size="large" />
-            {catWithDivider?.map((t) => (
-              <Heading level={4} key={t}>
+            {subtitle && (
+              <Text size="small" color="white">
+                {subtitle}
+              </Text>
+            )}
+            {catWithDivider?.map((t, i) => (
+              <Text size="small" color="accent-2" key={`${t}-${i}`}>
                 {t}
-              </Heading>
+              </Text>
             ))}
           </Box>
-          <Heading level={1} as="h1" margin="none">
-            {title}
-          </Heading>
-        </Box>
-      </Column>
-      <Column align="start" direction="row">
-        <Box background="white" pad="small">
-          <FormDown color="accent-1" />
         </Box>
       </Column>
+      <DownHex />
     </Container>
   );
 };
diff --git a/src/components/icons/DtComms.js b/src/components/icons/DtComms.js
new file mode 100644
index 0000000000000000000000000000000000000000..46b9edd7b3eece3bdc17a749ca67a46da9be76a3
--- /dev/null
+++ b/src/components/icons/DtComms.js
@@ -0,0 +1,18 @@
+import React from 'react';
+
+import { StyledIcon } from 'grommet-icons/StyledIcon';
+
+export const DtComms = (props) => (
+  <StyledIcon viewBox="0 0 24 24" a11yTitle="Communications" {...props}>
+    <path
+      fill="none"
+      stroke="#000"
+      strokeWidth="1"
+      strokeLinecap="round"
+      strokeLinejoin="bevel"
+      d="M4.8,23.7l3.6-6.6l3.6-6.6l3.6,6.6l3.6,6.6 M12,0.4c2.8,0,5.1,2.3,5.1,5.1s-2.3,5.1-5.1,5.1S6.9,8.3,6.9,5.5
+	S9.2,0.4,12,0.4C12,0.4,12,0.4,12,0.4z M8.4,17.1h7.2 M20.2,2.6c0.8,1.8,0.8,3.9,0,5.7 M3.8,8.1c-0.7-1.6-0.7-3.5,0-5.1 M23,1.7
+	c0.8,2.4,0.8,5.1,0,7.5 M1,9.2C0.2,6.8,0.2,4.1,1,1.7"
+    />
+  </StyledIcon>
+);
diff --git a/src/components/icons/DtComputeStore.js b/src/components/icons/DtComputeStore.js
new file mode 100644
index 0000000000000000000000000000000000000000..109251cbfdef737e5b55482b00376be8e0f5e5fa
--- /dev/null
+++ b/src/components/icons/DtComputeStore.js
@@ -0,0 +1,43 @@
+import React from 'react';
+
+import { StyledIcon } from 'grommet-icons/StyledIcon';
+
+export const DtComputeStore = (props) => {
+  const pathProps = {
+    fill: 'none',
+    stroke: '#000',
+    strokeWidth: '1',
+  };
+  return (
+    <StyledIcon viewBox="0 0 24 24" a11yTitle="DtComputeStore" {...props}>
+      <path
+        {...pathProps}
+        stroke="none"
+        fill="inherit"
+        d="M23.2,1v6.4H0.9V1H23.2 M23.4,0.3H0.7c-0.3,0-0.5,0.2-0.5,0.4c0,0,0,0,0,0v6.9c0,0.3,0.1,0.5,0.4,0.5c0,0,0.1,0,0.1,0h22.7
+	c0.3,0,0.5-0.2,0.5-0.5c0,0,0,0,0,0V0.8C23.9,0.6,23.7,0.4,23.4,0.3z"
+      />
+      <path
+        strokeLinecap="round"
+        {...pathProps}
+        d="M6.8,4.3h10.5 M3.2,4.3L3.2,4.3 M5,4.3L5,4.3 M20.8,4.3L20.8,4.3 M19,4.3L19,4.3"
+      />
+      <path strokeLinecap="round" {...pathProps} d="M7.7,23.5h8.6" />
+      <path strokeLinecap="round" {...pathProps} d="M9.2,20.9h5.5" />
+      <path strokeLinecap="round" {...pathProps} d="M12,18.4v2.5" />
+      <path strokeLinecap="round" {...pathProps} d="M12,8.2v2.5" />
+      <path
+        {...pathProps}
+        stroke="none"
+        fill="inherit"
+        d="M23.2,11.3v6.4H0.9v-6.4H23.2 M23.4,10.6H0.7c-0.3,0-0.5,0.2-0.5,0.5c0,0,0,0,0,0v6.9c0,0.3,0.2,0.5,0.5,0.5h22.7
+	c0.3,0,0.5-0.2,0.5-0.5c0,0,0,0,0,0v-6.9C23.8,10.8,23.6,10.6,23.4,10.6L23.4,10.6z"
+      />
+      <path
+        strokeLinecap="round"
+        {...pathProps}
+        d="M6.8,14.6h10.5 M3.2,14.6L3.2,14.6 M5,14.6L5,14.6 M20.8,14.6L20.8,14.6 M19,14.6L19,14.6"
+      />
+    </StyledIcon>
+  );
+};
diff --git a/src/components/icons/DtDataAnalysis.js b/src/components/icons/DtDataAnalysis.js
new file mode 100644
index 0000000000000000000000000000000000000000..7f03713fca40c1e77f2fc6dfd5b6c23ba636b5d8
--- /dev/null
+++ b/src/components/icons/DtDataAnalysis.js
@@ -0,0 +1,17 @@
+import React from 'react';
+
+import { StyledIcon } from 'grommet-icons/StyledIcon';
+
+export const DtDataAnalysis = (props) => (
+  <StyledIcon viewBox="0 0 24 24" a11yTitle="DtDataAnalysis" {...props}>
+    <path
+      fill="none"
+      stroke="#000"
+      strokeWidth="1"
+      d="M2.8,20.9c-1.2,0-2.1-0.9-2.1-2.1c0-1.2,0.9-2.1,2.1-2.1s2.1,0.9,2.1,2.1C4.9,20,4,20.9,2.8,20.9z M11.1,12.4
+	c0-1.2-0.9-2.1-2.1-2.1s-2.1,0.9-2.1,2.1s0.9,2.1,2.1,2.1S11.1,13.6,11.1,12.4z M17.2,15.4c0-1.2-0.9-2.1-2.1-2.1s-2.1,0.9-2.1,2.1
+	s0.9,2.1,2.1,2.1S17.2,16.6,17.2,15.4z M23.3,5.2c0-1.2-0.9-2.1-2.1-2.1c-1.2,0-2.1,0.9-2.1,2.1s0.9,2.1,2.1,2.1
+	C22.4,7.3,23.3,6.3,23.3,5.2z M16.1,13.6l4-6.7 M13.2,14.5l-2.4-1.2 M7.5,13.9l-3.2,3.3"
+    />
+  </StyledIcon>
+);
diff --git a/src/components/icons/DtDevSecOps.js b/src/components/icons/DtDevSecOps.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f9e104065dbac3217f8a3efcba4e1bad834cabe
--- /dev/null
+++ b/src/components/icons/DtDevSecOps.js
@@ -0,0 +1,16 @@
+import React from 'react';
+
+import { StyledIcon } from 'grommet-icons/StyledIcon';
+
+export const DtDevSecOps = (props) => (
+  <StyledIcon viewBox="0 0 24 24" a11yTitle="DtDevSecOps" {...props}>
+    <path
+      fill="none"
+      stroke="#000"
+      strokeWidth="1"
+      d="M4.3,0.3h3L8,3h2l0.6-2.6h2.6L14,2.9h1.7l0.8-2.6h3.1l-2,9H6.4L4.3,0.3z M8.1,9.6L7,20.6 M15.9,9.3l1.2,11
+	 M18.4,23.6H5.6c-0.9,0-1.6-0.7-1.6-1.6l0,0c0-0.9,0.7-1.6,1.6-1.6h12.8c0.9,0,1.6,0.7,1.6,1.6l0,0C20,22.9,19.3,23.7,18.4,23.6
+	C18.4,23.7,18.4,23.7,18.4,23.6L18.4,23.6z"
+    />
+  </StyledIcon>
+);
diff --git a/src/components/icons/DtDigiEng.js b/src/components/icons/DtDigiEng.js
new file mode 100644
index 0000000000000000000000000000000000000000..619ab69cd361864319173ed13bd50abf70c06385
--- /dev/null
+++ b/src/components/icons/DtDigiEng.js
@@ -0,0 +1,20 @@
+import React from 'react';
+
+import { StyledIcon } from 'grommet-icons/StyledIcon';
+
+export const DtDigiEng = (props) => (
+  <StyledIcon viewBox="0 0 24 24" a11yTitle="Digital Engineering" {...props}>
+    <path
+      fill="none"
+      stroke="#000"
+      strokeWidth="1"
+      d="M16.5,6.2l1.3,1.4l-1.4,1.7l0.6,1.4l2.3,0.3v1.9L17,13.2l-0.7,1.4l1.4,1.9l-1.2,1.4l-2-1.5l-1.3,0.6L13,19.3H11
+	L10.6,17l-1.2-0.5l-1.9,1.4l-1.4-1.3l1.4-2l-0.6-1.4l-2.3-0.4V11L7,10.9l0.7-1.5l-1.4-2l1.2-1.2l1.8,1.4l1.4-0.5L11,4.7H13L13.4,7
+	l1.3,0.7L16.5,6.2z M23.2,2.9c0,1.2-1,2.1-2.1,2c-1.2,0-2.1-1-2-2.1c0-1.2,1-2,2.1-2C22.2,0.8,23.2,1.8,23.2,2.9L23.2,2.9L23.2,2.9z
+	 M2.9,0.8c-1.2,0-2.1,1-2.1,2.1S1.8,5,2.9,5S5,4.1,5,2.9l0,0C5,1.8,4.1,0.8,2.9,0.8z M2.9,19.1c-1.2,0-2.1,1-2.1,2.1
+	c0,1.2,1,2.1,2.1,2.1s2.1-1,2.1-2.1l0,0C5,19.9,4.1,19.1,2.9,19.1z M21.1,19.1c-1.2,0-2.1,1-2.1,2.1c0,1.2,1,2.1,2.1,2.1
+	c1.2,0,2.1-1,2.1-2.1l0,0C23.2,19.9,22.2,19.1,21.1,19.1z M12,9.2c-1.5,0-2.8,1.3-2.8,2.8c0,1.5,1.3,2.8,2.8,2.8s2.8-1.3,2.8-2.8
+	S13.5,9.2,12,9.2L12,9.2z M4.5,4.6l2.3,2.3 M17.1,6.8l2.4-2.4 M17.2,17.1l2.2,2.2 M6.7,17.3l-2.2,2.2"
+    />
+  </StyledIcon>
+);
diff --git a/src/components/icons/DtHex.js b/src/components/icons/DtHex.js
new file mode 100644
index 0000000000000000000000000000000000000000..455fa3cf8147532cab2a0d3361cf49a81bad148d
--- /dev/null
+++ b/src/components/icons/DtHex.js
@@ -0,0 +1,14 @@
+import React from 'react';
+
+import { StyledIcon } from 'grommet-icons/StyledIcon';
+
+export const DtHex = (props) => (
+  <StyledIcon viewBox="0 0 24 24" a11yTitle="DtHex" {...props}>
+    <path
+      fill="#000"
+      stroke="none"
+      transform="translate(406 1272)"
+      d="M-382.2-1259.9l-5.7-10.4h-11.9l-5.9,9.9l5.9,10.7h11.9L-382.2-1259.9z"
+    />
+  </StyledIcon>
+);
diff --git a/src/components/icons/DtNetConn.js b/src/components/icons/DtNetConn.js
new file mode 100644
index 0000000000000000000000000000000000000000..6f73b8c836ac76996f4ac1d3b210e80e00d0c0e6
--- /dev/null
+++ b/src/components/icons/DtNetConn.js
@@ -0,0 +1,22 @@
+import React from 'react';
+
+import { StyledIcon } from 'grommet-icons/StyledIcon';
+
+export const DtNetConn = (props) => (
+  <StyledIcon viewBox="0 0 24 24" a11yTitle="Network / Connectivity" {...props}>
+    <path
+      fill="none"
+      stroke="#000"
+      strokeWidth="1"
+      d="M2.3,10.3C3.3,10.3,4,11.1,4,12s-0.8,1.7-1.7,1.7S0.6,12.9,0.6,12S1.4,10.3,2.3,10.3z M12,0.6
+	c0.9,0,1.7,0.8,1.7,1.7S13,4,12,4s-1.7-0.8-1.7-1.7S11.1,0.6,12,0.6z M12.1,20c0.9,0,1.7,0.8,1.7,1.7c0,0.9-0.8,1.7-1.7,1.7
+	s-1.7-0.8-1.7-1.7C10.4,20.7,11.1,20,12.1,20z M5.2,17c0.9,0,1.7,0.8,1.7,1.7c0,0.9-0.8,1.7-1.7,1.7s-1.7-0.8-1.7-1.7
+	C3.4,17.8,4.2,17,5.2,17z M5.2,3.4c0.9,0,1.7,0.8,1.7,1.7S6.1,6.9,5.2,6.9S3.4,6.1,3.4,5.2S4.2,3.4,5.2,3.4z M18.8,3.4
+	c0.9,0,1.7,0.8,1.7,1.7s-0.8,1.7-1.7,1.7c-0.9,0-1.7-0.8-1.7-1.7S17.9,3.4,18.8,3.4z M21.7,10.3c0.9,0,1.7,0.8,1.7,1.7
+	s-0.8,1.7-1.7,1.7c-0.9,0-1.7-0.8-1.7-1.7S20.7,10.3,21.7,10.3z M18.8,17c0.9,0,1.7,0.8,1.7,1.7c0,0.9-0.8,1.7-1.7,1.7
+	c-0.9,0-1.7-0.8-1.7-1.7C17.1,17.8,17.9,17,18.8,17z M12,8.2c2.1,0,3.8,1.7,3.8,3.8s-1.7,3.8-3.8,3.8S8.2,14.1,8.2,12
+	S9.9,8.2,12,8.2z M12,4v4.1 M15.8,12H20 M12,15.8V20 M8.2,12H4 M6.4,6.4l2.9,2.9 M14.7,9.3l2.9-2.9 M14.7,14.7l2.9,2.9 M9.3,14.7
+	l-2.9,2.9"
+    />
+  </StyledIcon>
+);
diff --git a/src/components/icons/DtSquare.js b/src/components/icons/DtSquare.js
new file mode 100644
index 0000000000000000000000000000000000000000..db8525e7c53c3adf48b5f32a834705a44b1c5a73
--- /dev/null
+++ b/src/components/icons/DtSquare.js
@@ -0,0 +1,9 @@
+import React from 'react';
+
+import { StyledIcon } from 'grommet-icons/StyledIcon';
+
+export const DtSquare = (props) => (
+  <StyledIcon viewBox="0 0 24 24" a11yTitle="Square" {...props}>
+    <rect x="0.5" y="0.5" width="23" height="23" fill="#000" stroke="none" />
+  </StyledIcon>
+);
diff --git a/src/components/icons/Reference.js b/src/components/icons/Reference.js
new file mode 100644
index 0000000000000000000000000000000000000000..70dd130b60856a4b79e106bbfc7afb79907f389b
--- /dev/null
+++ b/src/components/icons/Reference.js
@@ -0,0 +1,29 @@
+import React from 'react';
+import * as icons from './';
+
+/**
+ * Map icons to category name
+ * @param {object} props - React props
+ * @param {string} props.name - Category name
+ * @returns {Component}
+ */
+const Reference = ({ name, ...rest }) => {
+  switch (name) {
+    case 'Networking & Connectivity':
+      return <icons.DtNetConn {...rest} />;
+    case 'Compute & Store':
+      return <icons.DtComputeStore {...rest} />;
+    case 'Software Development & DevSecOps':
+      return <icons.DtDevSecOps {...rest} />;
+    case 'Digital Engineering':
+      return <icons.DtDigiEng {...rest} />;
+    case 'Communications':
+      return <icons.DtComms {...rest} />;
+    case 'Data Analysis':
+      return <icons.DtDataAnalysis {...rest} />;
+    default:
+      return <icons.DtNetConn {...rest} />;
+  }
+};
+
+export default Reference;
diff --git a/src/components/icons/Security.js b/src/components/icons/Security.js
deleted file mode 100644
index 6a5d91679492faa253fd1dd084c869fdb3537b41..0000000000000000000000000000000000000000
--- a/src/components/icons/Security.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-
-import { StyledIcon } from 'grommet-icons/StyledIcon';
-
-const Security = (props) => (
-  <StyledIcon viewBox="0 0 25 25" a11yTitle="Security" {...props}>
-    <path
-      d="M12.5,24.1c-0.1,0-0.2,0-0.3-0.1C2.8,18.1,2.9,8,3,6.5c0,0,0-0.1,0-0.1c0-0.3,0.2-0.5,0.5-0.5c0.1,0,5.9-0.1,8.7-4.6
-	c0.2-0.3,0.6-0.3,0.8,0c2.8,4.4,8.6,4.6,8.7,4.6c0.2,0,0.4,0.2,0.5,0.4c0,0.1,0.9,11.3-9.2,17.6C12.8,24.1,12.7,24.1,12.5,24.1z
-	 M3.9,6.8c-0.1,2,0.2,10.9,8.6,16.2c8.4-5.3,8.7-14.2,8.6-16.2c-1.4-0.1-5.9-0.7-8.6-4.4C9.8,6.1,5.4,6.7,3.9,6.8z"
-    />
-  </StyledIcon>
-);
-
-export default Security;
diff --git a/src/components/icons/index.js b/src/components/icons/index.js
index 8ee0b83576c96c9eebfede4631546ed577956e33..4c3c37679351dc7285c089454b141949e1d3a843 100644
--- a/src/components/icons/index.js
+++ b/src/components/icons/index.js
@@ -1 +1,8 @@
-export { default as Security } from './Security';
+export * from './DtNetConn';
+export * from './DtComms';
+export * from './DtDevSecOps';
+export * from './DtDigiEng';
+export * from './DtComputeStore';
+export * from './DtDataAnalysis';
+export * from './DtSquare';
+export * from './DtHex';
diff --git a/src/components/mega-menu/MegaMenu.js b/src/components/mega-menu/MegaMenu.js
index f98fd3f45f29edbf054946119c55d90f19f00ba3..96b28de9b37c8761fb7914a6041dcf89b93271ba 100644
--- a/src/components/mega-menu/MegaMenu.js
+++ b/src/components/mega-menu/MegaMenu.js
@@ -1,6 +1,14 @@
 import React from 'react';
 import { Box, Text, Heading } from 'grommet';
 import styled from 'styled-components';
+import {
+  DtNetConn,
+  DtComms,
+  DtDevSecOps,
+  DtComputeStore,
+  DtDigiEng,
+  DtDataAnalysis,
+} from '../icons';
 import MenuGroup from './MenuGroup';
 import { Link } from '../core';
 
@@ -11,9 +19,42 @@ const StyledMenu = styled(Box)`
   right: 20px;
 `;
 
+const Divider = ({ ...props }) => (
+  <Box
+    margin={{ vertical: 'medium' }}
+    height="2px"
+    background="light-1"
+    {...props}
+  />
+);
+
+const GroupHeader = ({ label, icon, overview }) => (
+  <Box
+    direction="row"
+    align="center"
+    gap="small"
+    margin={{ vertical: 'small' }}
+  >
+    {icon}
+    <Heading level={6} margin="none">
+      {label}
+    </Heading>
+    {overview && (
+      <Link to={overview} size="xsmall">
+        Overview
+      </Link>
+    )}
+  </Box>
+);
+
 const MegaMenu = ({ sticky }) => (
   <StyledMenu sticky={sticky}>
-    <Box pad="large" background="white" elevation="small">
+    <Box
+      pad="large"
+      background="white"
+      elevation="small"
+      style={{ zIndex: 20 }}
+    >
       <Heading level={2} margin="none">
         Available Services
       </Heading>
@@ -22,70 +63,70 @@ const MegaMenu = ({ sticky }) => (
       </Text>
       <Box direction="row" gap="medium">
         <Box border={{ side: 'right' }} basis="1/2">
-          <Heading level={4} margin={{ bottom: 'none' }}>
-            Networking & Connectivity
-            <Link to="/networking-connectivity" size="xsmall">
-              Overview
-            </Link>
-          </Heading>
+          <GroupHeader
+            label="Networking & Connectivity"
+            icon={<DtNetConn />}
+            overview="/networking-connectivity"
+          />
 
           <Box direction="row">
             <Box basis="1/2">
-              <Box>
-                <Heading level={5}>Global Networking / WAN</Heading>
-                <MenuGroup category="Global Networking / WAN" />
-              </Box>
-              <Box>
-                <Heading level={5}>Local Networking / BAN</Heading>
-                <MenuGroup category="Local Networking / BAN" />
-              </Box>
+              <MenuGroup
+                title="Global Connectivity / WAN"
+                category="Global Connectivity / WAN"
+              />
+              <MenuGroup
+                title="Local Connectivity / BAN"
+                category="Local Connectivity / BAN"
+              />
             </Box>
             <Box basis="1/2">
-              <Box>
-                <Heading level={5}>Cloud Access</Heading>
-                <MenuGroup category="Cloud Access" />
-              </Box>
-              <Box>
-                <Heading level={5}>Reference Architectures</Heading>
-                <MenuGroup category="Reference Architectures" />
-              </Box>
-              <Box>
-                <Heading level={5}>Voice / VoIP</Heading>
-                <MenuGroup category="Voice / VoIP" />
-              </Box>
+              <MenuGroup title="Cloud Access" category="Cloud Access" />
+              <MenuGroup
+                title="Reference Architectures"
+                category="Reference Architectures"
+              />
+              <MenuGroup
+                title="Virtual Private Connections"
+                category="Virtual Private Connections"
+              />
             </Box>
           </Box>
         </Box>
         <Box direction="row" basis="1/2">
           <Box>
             <Box>
-              <Heading level={4}>DevSecOps</Heading>
-              <MenuGroup category="DevSecOps" />
+              <GroupHeader
+                label="Compute & Store"
+                icon={<DtComputeStore />}
+                overview="/hosting-infrastructure"
+              />
+              <MenuGroup category="Compute & Store" />
             </Box>
+            <Divider />
             <Box>
-              <Heading level={4}>
-                Hosting Infrastructure{' '}
-                <Link to="/hosting-infrastructure" size="xsmall">
-                  Overview
-                </Link>
-              </Heading>
-
-              <MenuGroup category="Hosting Infrastructure" />
-            </Box>
-            <Box>
-              <Heading level={4}>Security</Heading>
-              <MenuGroup category="Security" />
+              <GroupHeader
+                label="Software Development & DevSecOps"
+                icon={<DtDevSecOps />}
+              />
+              <MenuGroup category="Software Development & DevSecOps" />
             </Box>
           </Box>
           <Box>
             <Box>
-              <Heading level={4}>Productivity & Collaboration</Heading>
-              <MenuGroup category="Productivity & Collaboration" />
+              <GroupHeader label="Digital Engineering" icon={<DtDigiEng />} />
+              <MenuGroup category="Digital Engineering" />
             </Box>
+            <Divider />
             <Box>
-              <Heading level={4}>Communications</Heading>
+              <GroupHeader label="Communications" icon={<DtComms />} />
               <MenuGroup category="Communications" />
             </Box>
+            <Divider />
+            <Box>
+              <GroupHeader label="Data Analysis" icon={<DtDataAnalysis />} />
+              <MenuGroup category="Data Analysis" />
+            </Box>
           </Box>
         </Box>
       </Box>
diff --git a/src/components/mega-menu/MegaMobileMenu.js b/src/components/mega-menu/MegaMobileMenu.js
new file mode 100644
index 0000000000000000000000000000000000000000..ac00b767af14ae4ddbcae022c030310867ca9689
--- /dev/null
+++ b/src/components/mega-menu/MegaMobileMenu.js
@@ -0,0 +1,81 @@
+import React, { useState } from 'react';
+import { Box, Button } from 'grommet';
+import { Close } from 'grommet-icons';
+
+const MenuItem = ({ label, onClick }) => (
+  <Box background="white" pad="large" flex={{ shrink: 0 }}>
+    <Button label={label} onClick={onClick} />
+  </Box>
+);
+
+const MenuHome = ({ onNavigate }) => (
+  <Box gap="xsmall" fill>
+    {[
+      'Available Services',
+      'Solutions',
+      'About Us',
+      'Our Other Programs',
+      '1',
+      '2',
+      '3',
+      '4',
+      '5',
+      '6',
+      '10',
+      '20',
+      '30',
+      '40',
+      '50',
+      '60',
+    ].map((item) => (
+      <MenuItem label={item} key={item} onClick={() => onNavigate(item)} />
+    ))}
+  </Box>
+);
+
+const MenuCategory = ({ onNavigate }) => (
+  <Box
+    gap="xsmall"
+    background="black"
+    border={{ color: 'green' }}
+    style={{ position: 'absolute', top: 0, left: 0, right: 0, bottom: 0 }}
+  >
+    {[
+      'Networking & Connectivity',
+      'Compute & Store',
+      'Software Development & DevSecOps',
+      'Communications',
+      'Data Analysis',
+    ].map((item) => (
+      <MenuItem label={item} key={item} onClick={() => onNavigate(item)} />
+    ))}
+  </Box>
+);
+
+const MegaMobileMenu = ({ onClose }) => {
+  const [depth, setDepth] = useState(0);
+
+  const handleNavigate = (name) => {
+    console.log('handle nav', name);
+    setDepth(depth + 1);
+  };
+
+  return (
+    <Box background="black" pad="medium">
+      <Box height="100px" justify="end" direction="row">
+        <Button icon={<Close />} onClick={onClose} />
+      </Box>
+      <Box
+        border={{ color: 'red' }}
+        overflow="scroll"
+        fill
+        style={{ position: 'relative' }}
+      >
+        <MenuHome onNavigate={handleNavigate} />
+        {depth === 1 && <MenuCategory />}
+      </Box>
+    </Box>
+  );
+};
+
+export default MegaMobileMenu;
diff --git a/src/components/mega-menu/MenuGroup.js b/src/components/mega-menu/MenuGroup.js
index 732cf3b87bf04dca6e6b7ade021d1863338a0cd9..19b414235c2ca6b66b67368ca4f6e84a8343d96a 100644
--- a/src/components/mega-menu/MenuGroup.js
+++ b/src/components/mega-menu/MenuGroup.js
@@ -1,20 +1,22 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Box, Text } from 'grommet';
+import { Box, Heading } from 'grommet';
 import { useStaticQuery, graphql } from 'gatsby';
 import { Link } from '../core';
 
-const MenuGroup = ({ category }) => {
+const MenuGroup = ({ category, title }) => {
   const {
     allMarkdownRemark: { nodes },
   } = useStaticQuery(graphql`
     query MenuGroupQuery {
-      allMarkdownRemark(sort: { fields: frontmatter___title, order: ASC }) {
+      allMarkdownRemark(
+        sort: { fields: frontmatter___title, order: ASC }
+        filter: { fileAbsolutePath: { regex: "/content/service-detail/" } }
+      ) {
         nodes {
           id
           frontmatter {
             title
-            subtitle
             slug
             categories
           }
@@ -29,14 +31,21 @@ const MenuGroup = ({ category }) => {
 
   return (
     <Box gap="xsmall">
+      {title && (
+        <Heading level={6} margin={{ vertical: 'small', horizontal: 'medium' }}>
+          {title}
+        </Heading>
+      )}
       {tagGroup.map((item) => (
-        <Box direction="row" width="medium" key={item.id} gap="small">
+        <Box
+          direction="row"
+          key={item.id}
+          gap="small"
+          pad={{ horizontal: 'large' }}
+        >
           <Link to={item.frontmatter.slug} size="small">
             {item.frontmatter.title}
           </Link>
-          {item.frontmatter.subtitle && (
-            <Text size="xsmall">- {item.frontmatter.subtitle}</Text>
-          )}
         </Box>
       ))}
     </Box>
@@ -45,6 +54,7 @@ const MenuGroup = ({ category }) => {
 
 MenuGroup.propTypes = {
   category: PropTypes.string.isRequired,
+  title: PropTypes.string,
 };
 
 export default MenuGroup;
diff --git a/src/components/mega-menu/index.js b/src/components/mega-menu/index.js
index 3003aca8694afb70299e2b575ff828ba5a079249..8005d2ea99477364cffa49c90c578a800f6cfae9 100644
--- a/src/components/mega-menu/index.js
+++ b/src/components/mega-menu/index.js
@@ -1,2 +1,3 @@
 export { default as MegaMenu } from './MegaMenu';
 export { default as MenuGroup } from './MenuGroup';
+export { default as MegaMobileMenu } from './MegaMobileMenu';
diff --git a/src/components/pages/home/OfferAccordion.js b/src/components/pages/home/OfferAccordion.js
index 4dc2ed105a8d75e84eda26562e2abb5da01a96e9..15886f183f5627a2bf8a3713ad618c1a1ed07354 100644
--- a/src/components/pages/home/OfferAccordion.js
+++ b/src/components/pages/home/OfferAccordion.js
@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
-import { Accordion, AccordionPanel, Box, Text, Heading } from 'grommet';
-import { ServerCluster, Nodes, Deploy, FormUp, FormDown } from 'grommet-icons';
+import { Accordion, AccordionPanel, Box, Text } from 'grommet';
+import { FormUp, FormDown } from 'grommet-icons';
+import Reference from '../../icons/Reference';
 import { MenuGroup } from '../../mega-menu';
 
 const OfferHeader = ({ title, icon, description, active }) => (
@@ -33,13 +34,18 @@ const OfferAcc = () => {
   };
 
   return (
-    <Box width="large">
-      <Accordion alignSelf="stretch" gap="small" onActive={handleChange}>
+    <Box width="large" pad={{ vertical: 'large' }}>
+      <Accordion
+        alignSelf="stretch"
+        gap="small"
+        onActive={handleChange}
+        a11yTitle="Solutions List"
+      >
         <AccordionPanel
           header={
             <OfferHeader
               title="Networking & Connectivity"
-              icon={<Nodes />}
+              icon={<Reference name="Networking & Connectivity" />}
               active={activeList.includes(0)}
             />
           }
@@ -50,46 +56,33 @@ const OfferAcc = () => {
             gap="large"
           >
             <Box basis="1/2" gap="medium">
-              <Box gap="small">
-                <Heading level={5} margin="none">
-                  Global Networking / WAN
-                </Heading>
-                <MenuGroup category="Global Networking / WAN" />
-              </Box>
-              <Box gap="small">
-                <Heading level={5} margin="none">
-                  Local Networking / BAN
-                </Heading>
-                <MenuGroup category="Local Networking / BAN" />
-              </Box>
+              <MenuGroup
+                title="Global Connectivity / WAN"
+                category="Global Connectivity / WAN"
+              />
+              <MenuGroup
+                title="Local Connectivity / BAN"
+                category="Local Connectivity / BAN"
+              />
             </Box>
             <Box basis="1/2" gap="medium">
-              <Box gap="small">
-                <Heading level={5} margin="none">
-                  Cloud Access
-                </Heading>
-                <MenuGroup category="Cloud Access" />
-              </Box>
-              <Box gap="small">
-                <Heading level={5} margin="none">
-                  Reference Architectures
-                </Heading>
-                <MenuGroup category="Reference Architectures" />
-              </Box>
-              <Box gap="small">
-                <Heading level={5} margin="none">
-                  Voice / VoIP
-                </Heading>
-                <MenuGroup category="Voice / VoIP" />
-              </Box>
+              <MenuGroup title="Cloud Access" category="Cloud Access" />
+              <MenuGroup
+                title="Reference Architectures"
+                category="Reference Architectures"
+              />
+              <MenuGroup
+                title="Virtual Private Connections"
+                category="Virtual Private Connections"
+              />
             </Box>
           </Box>
         </AccordionPanel>
         <AccordionPanel
           header={
             <OfferHeader
-              title="DevSecOps"
-              icon={<Deploy />}
+              title="Compute & Store"
+              icon={<Reference name="Compute & Store" />}
               active={activeList.includes(1)}
             />
           }
@@ -100,17 +93,15 @@ const OfferAcc = () => {
             gap="large"
           >
             <Box basis="1/2" gap="medium">
-              <Box gap="small">
-                <MenuGroup category="DevSecOps" />
-              </Box>
+              <MenuGroup category="Compute & Store" />
             </Box>
           </Box>
         </AccordionPanel>
         <AccordionPanel
           header={
             <OfferHeader
-              title="Hosting Infrastructure"
-              icon={<ServerCluster />}
+              title="Software Development & DevSecOps"
+              icon={<Reference name="Software Development & DevSecOps" />}
               active={activeList.includes(2)}
             />
           }
@@ -121,17 +112,15 @@ const OfferAcc = () => {
             gap="large"
           >
             <Box basis="1/2" gap="medium">
-              <Box gap="small">
-                <MenuGroup category="Hosting Infrastructure" />
-              </Box>
+              <MenuGroup category="Software Development & DevSecOps" />
             </Box>
           </Box>
         </AccordionPanel>
         <AccordionPanel
           header={
             <OfferHeader
-              title="Security"
-              icon={<ServerCluster />}
+              title="Digital Engineering"
+              icon={<Reference name="Digital Engineering" />}
               active={activeList.includes(3)}
             />
           }
@@ -142,17 +131,15 @@ const OfferAcc = () => {
             gap="large"
           >
             <Box basis="1/2" gap="medium">
-              <Box gap="small">
-                <MenuGroup category="Security" />
-              </Box>
+              <MenuGroup category="Digital Engineering" />
             </Box>
           </Box>
         </AccordionPanel>
         <AccordionPanel
           header={
             <OfferHeader
-              title="Productivity & Collaboration"
-              icon={<ServerCluster />}
+              title="Communications"
+              icon={<Reference name="Communications" />}
               active={activeList.includes(4)}
             />
           }
@@ -163,17 +150,15 @@ const OfferAcc = () => {
             gap="large"
           >
             <Box basis="1/2" gap="medium">
-              <Box gap="small">
-                <MenuGroup category="Productivity & Collaboration" />
-              </Box>
+              <MenuGroup category="Communications" />
             </Box>
           </Box>
         </AccordionPanel>
         <AccordionPanel
           header={
             <OfferHeader
-              title="Communications"
-              icon={<ServerCluster />}
+              title="Data Analysis"
+              icon={<Reference name="Data Analysis" />}
               active={activeList.includes(5)}
             />
           }
@@ -184,9 +169,7 @@ const OfferAcc = () => {
             gap="large"
           >
             <Box basis="1/2" gap="medium">
-              <Box gap="small">
-                <MenuGroup category="Communications" />
-              </Box>
+              <MenuGroup category="Data Analysis" />
             </Box>
           </Box>
         </AccordionPanel>
diff --git a/src/components/pages/home/Solutions.js b/src/components/pages/home/Solutions.js
index 7d4939e99d0e09355b4569048ecf8dc5060a7dbe..2b845ea060e4a81dfba4a043203c55c4c5b27ec2 100644
--- a/src/components/pages/home/Solutions.js
+++ b/src/components/pages/home/Solutions.js
@@ -1,51 +1,9 @@
-import React, { useContext } from 'react';
-import { Box, Grid, Text, ResponsiveContext } from 'grommet';
-import { ServerCluster, Cluster, Nodes, Deploy } from 'grommet-icons';
-
-const columns = {
-  small: ['full'],
-  medium: ['medium', 'medium'],
-  large: ['medium', 'medium'],
-  xlarge: ['medium', 'medium'],
-};
-
-const rows = {
-  small: ['auto', 'auto'],
-  medium: ['auto', 'auto'],
-  large: ['auto'],
-  xlarge: ['auto'],
-};
-
-const fixedGridAreas = {
-  small: [
-    { name: 'col1', start: [0, 0], end: [0, 0] },
-    { name: 'col2', start: [0, 1], end: [0, 1] },
-  ],
-  medium: [
-    { name: 'col1', start: [0, 0], end: [0, 0] },
-    { name: 'col2', start: [1, 0], end: [1, 0] },
-  ],
-  large: [
-    { name: 'col1', start: [0, 0], end: [0, 0] },
-    { name: 'col2', start: [1, 0], end: [1, 0] },
-  ],
-  xlarge: [
-    { name: 'col1', start: [0, 0], end: [0, 0] },
-    { name: 'col2', start: [1, 0], end: [1, 0] },
-  ],
-};
-
-const serviceList = [
-  [
-    { icon: <Nodes />, label: 'Global Networking / WAN' },
-    { icon: <Cluster />, label: 'Productivity & Collaboration' },
-  ],
-  [
-    { icon: <ServerCluster />, label: 'Hosting Infrastructure' },
-    { icon: <Deploy />, label: 'DevSecOps' },
-    { icon: <Cluster />, label: 'Productivity & Collaboration' },
-  ],
-];
+import React from 'react';
+import { useStaticQuery, graphql } from 'gatsby';
+import { Box, Text, Heading, Paragraph } from 'grommet';
+import { DtNetConn } from '../../icons';
+import Reference from '../../icons/Reference';
+import { Link, PrimaryButton } from '../../core';
 
 /**
  * 2 column responsive grid block
@@ -53,41 +11,87 @@ const serviceList = [
  * @returns {Component}
  */
 const Solutions = () => {
-  const size = useContext(ResponsiveContext);
+  const { allMarkdownRemark } = useStaticQuery(graphql`
+    query HomeSolutionsQuery {
+      allMarkdownRemark(
+        filter: { fileAbsolutePath: { regex: "/content/solutions/" } }
+        sort: { order: ASC, fields: frontmatter___index }
+      ) {
+        edges {
+          node {
+            frontmatter {
+              title
+              useCase
+              slug
+              categories
+            }
+          }
+        }
+      }
+    }
+  `);
+
+  // Use the first 2 items from the solutions list
+  const s1 = allMarkdownRemark.edges[0].node;
+  const s2 = allMarkdownRemark.edges[1].node;
 
   return (
-    <Grid
-      alignSelf="center"
-      columns={columns[size]}
-      rows={rows[size]}
-      gap="xlarge"
-      areas={fixedGridAreas[size]}
-    >
-      <Box gridArea="col1" gap="medium">
-        <Text weight="bold" as="p">
-          Set up a collaborative network space where multiple separate teams can
-          work collaboratively.
-        </Text>
-        {serviceList[0].map((item) => (
-          <Box direction="row" gap="medium" key={item.label}>
-            {item.icon}
-            <Text>{item.label}</Text>
-          </Box>
-        ))}
+    <Box align="center" pad={{ vertical: 'large' }}>
+      <Box align="center" style={{ position: 'relative' }}>
+        <Box style={{ zIndex: 2 }}>
+          <Heading
+            level={1}
+            as="h2"
+            textAlign="center"
+            margin={{ bottom: 'medium' }}
+          >
+            Got Needs That Go Beyond <br /> A Single Service?
+          </Heading>
+          <Paragraph textAlign="center" style={{ letterSpacing: '0.05em' }}>
+            Our solutions include combinations of services to meet common uses.
+          </Paragraph>
+        </Box>
+
+        <DtNetConn
+          size="300"
+          color="#F5F5F5"
+          style={{ position: 'absolute', top: '0', zIndex: 0 }}
+        />
+      </Box>
+      <Box direction="row" width="large" gap="large" style={{ zIndex: 2 }}>
+        <Box gap="medium" basis="1/2">
+          <Text weight="bold" as="p">
+            {s1.frontmatter.useCase}
+          </Text>
+          {s1.frontmatter.categories.map((item) => (
+            <Box direction="row" gap="medium" key={item}>
+              <Reference name={item} size="20px" />
+              <Text size="small" color="dark-1">
+                {item}
+              </Text>
+            </Box>
+          ))}
+          <Link to={s1.frontmatter.slug}>Learn More</Link>
+        </Box>
+        <Box gap="medium" basis="1/2">
+          <Text weight="bold" as="p">
+            {s2.frontmatter.useCase}
+          </Text>
+          {s2.frontmatter.categories.map((item) => (
+            <Box direction="row" gap="medium" key={item}>
+              <Reference name={item} size="20px" />
+              <Text size="small" color="dark-1">
+                {item}
+              </Text>
+            </Box>
+          ))}
+          <Link to={s2.frontmatter.slug}>Learn More</Link>
+        </Box>
       </Box>
-      <Box gridArea="col2" gap="medium">
-        <Text weight="bold" as="p">
-          Create a cloud-native mission application but I don't have a
-          development team.
-        </Text>
-        {serviceList[1].map((item) => (
-          <Box direction="row" gap="medium" key={item.label}>
-            {item.icon}
-            <Text>{item.label}</Text>
-          </Box>
-        ))}
+      <Box width="300px" margin="large">
+        <PrimaryButton label="SEE MORE SOLUTIONS" />
       </Box>
-    </Grid>
+    </Box>
   );
 };
 export default Solutions;
diff --git a/src/components/pages/home/SolutionsGrid.js b/src/components/pages/home/SolutionsGrid.js
new file mode 100644
index 0000000000000000000000000000000000000000..7d4939e99d0e09355b4569048ecf8dc5060a7dbe
--- /dev/null
+++ b/src/components/pages/home/SolutionsGrid.js
@@ -0,0 +1,93 @@
+import React, { useContext } from 'react';
+import { Box, Grid, Text, ResponsiveContext } from 'grommet';
+import { ServerCluster, Cluster, Nodes, Deploy } from 'grommet-icons';
+
+const columns = {
+  small: ['full'],
+  medium: ['medium', 'medium'],
+  large: ['medium', 'medium'],
+  xlarge: ['medium', 'medium'],
+};
+
+const rows = {
+  small: ['auto', 'auto'],
+  medium: ['auto', 'auto'],
+  large: ['auto'],
+  xlarge: ['auto'],
+};
+
+const fixedGridAreas = {
+  small: [
+    { name: 'col1', start: [0, 0], end: [0, 0] },
+    { name: 'col2', start: [0, 1], end: [0, 1] },
+  ],
+  medium: [
+    { name: 'col1', start: [0, 0], end: [0, 0] },
+    { name: 'col2', start: [1, 0], end: [1, 0] },
+  ],
+  large: [
+    { name: 'col1', start: [0, 0], end: [0, 0] },
+    { name: 'col2', start: [1, 0], end: [1, 0] },
+  ],
+  xlarge: [
+    { name: 'col1', start: [0, 0], end: [0, 0] },
+    { name: 'col2', start: [1, 0], end: [1, 0] },
+  ],
+};
+
+const serviceList = [
+  [
+    { icon: <Nodes />, label: 'Global Networking / WAN' },
+    { icon: <Cluster />, label: 'Productivity & Collaboration' },
+  ],
+  [
+    { icon: <ServerCluster />, label: 'Hosting Infrastructure' },
+    { icon: <Deploy />, label: 'DevSecOps' },
+    { icon: <Cluster />, label: 'Productivity & Collaboration' },
+  ],
+];
+
+/**
+ * 2 column responsive grid block
+ * @see https://storybook.grommet.io/?path=/story/layout-grid-responsive-grid--responsive-grid
+ * @returns {Component}
+ */
+const Solutions = () => {
+  const size = useContext(ResponsiveContext);
+
+  return (
+    <Grid
+      alignSelf="center"
+      columns={columns[size]}
+      rows={rows[size]}
+      gap="xlarge"
+      areas={fixedGridAreas[size]}
+    >
+      <Box gridArea="col1" gap="medium">
+        <Text weight="bold" as="p">
+          Set up a collaborative network space where multiple separate teams can
+          work collaboratively.
+        </Text>
+        {serviceList[0].map((item) => (
+          <Box direction="row" gap="medium" key={item.label}>
+            {item.icon}
+            <Text>{item.label}</Text>
+          </Box>
+        ))}
+      </Box>
+      <Box gridArea="col2" gap="medium">
+        <Text weight="bold" as="p">
+          Create a cloud-native mission application but I don't have a
+          development team.
+        </Text>
+        {serviceList[1].map((item) => (
+          <Box direction="row" gap="medium" key={item.label}>
+            {item.icon}
+            <Text>{item.label}</Text>
+          </Box>
+        ))}
+      </Box>
+    </Grid>
+  );
+};
+export default Solutions;
diff --git a/src/components/pages/home/Steps.js b/src/components/pages/home/Steps.js
new file mode 100644
index 0000000000000000000000000000000000000000..9f961604fa0c72f29bff6cf621421883f4396e45
--- /dev/null
+++ b/src/components/pages/home/Steps.js
@@ -0,0 +1,102 @@
+import React, { useContext } from 'react';
+import { Box, Text, ResponsiveContext } from 'grommet';
+import { DtHex } from '../../icons';
+
+const Step = ({ number, isMobile, children }) => (
+  <Box
+    basis="1/4"
+    pad={{ horizontal: 'small' }}
+    align="center"
+    direction={isMobile ? 'row' : 'column'}
+    gap="medium"
+  >
+    <Box
+      height="65px"
+      width="80px"
+      flex={{ shrink: 0 }}
+      style={{ position: 'relative' }}
+      align="center"
+      justify="center"
+    >
+      <Text size="xlarge" weight="bold" color="accent-2" style={{ zIndex: 2 }}>
+        {number}
+      </Text>
+      <DtHex
+        color="accent-2"
+        size="65"
+        style={{
+          position: 'absolute',
+          top: '50%',
+          zIndex: 0,
+          transform: 'translateY(-50%)',
+        }}
+      />
+      <DtHex
+        color="black"
+        size="59"
+        style={{
+          position: 'absolute',
+          top: '50%',
+          zIndex: 0,
+          transform: 'translateY(-50%)',
+        }}
+      />
+    </Box>
+    <Box align="center">{children}</Box>
+  </Box>
+);
+
+const Steps = () => {
+  const size = useContext(ResponsiveContext);
+
+  const isMobile = ['xsmall', 'small'].includes(size);
+
+  return (
+    <Box
+      direction={isMobile ? 'column' : 'row'}
+      width={isMobile ? 'medium' : 'large'}
+      pad={{ vertical: 'large' }}
+      gap={isMobile ? 'large' : 'none'}
+    >
+      <Step number={1} isMobile={isMobile}>
+        <Text size="small" textAlign={isMobile ? 'start' : 'center'}>
+          <Text weight="bold" size="small">
+            Explore
+          </Text>{' '}
+          our services below to find what you need.
+        </Text>
+      </Step>
+      <Step number={2} isMobile={isMobile}>
+        <Text size="small" textAlign={isMobile ? 'start' : 'center'}>
+          <Text size="small" weight="bold">
+            Request
+          </Text>{' '}
+          a consultation with us.
+        </Text>
+      </Step>
+      <Step number={3} isMobile={isMobile}>
+        <Text size="small" textAlign={isMobile ? 'start' : 'center'}>
+          We'll{' '}
+          <Text size="small" weight="bold">
+            connect
+          </Text>{' '}
+          you with the right team.
+        </Text>
+      </Step>
+      <Step number={4} isMobile={isMobile}>
+        <Text size="small" textAlign={isMobile ? 'start' : 'center'}>
+          Your services are{' '}
+          <Text size="small" weight="bold">
+            configured
+          </Text>{' '}
+          and{' '}
+          <Text size="small" weight="bold">
+            delivered
+          </Text>
+        </Text>
+      </Step>
+    </Box>
+  );
+};
+
+export default Steps;
diff --git a/src/components/pages/home/index.js b/src/components/pages/home/index.js
index 08cd28b8105423f1c4d73902261ce056938d2abf..f55cc7bb30b5d29ba41d7e75105de6552a72e198 100644
--- a/src/components/pages/home/index.js
+++ b/src/components/pages/home/index.js
@@ -1,2 +1,3 @@
 export { default as OfferAccordion } from './OfferAccordion';
 export { default as Solutions } from './Solutions';
+export { default as Steps } from './Steps';
diff --git a/src/components/pages/service-category/ServiceList.js b/src/components/pages/service-category/ServiceList.js
index a28bf0afa52ffbde20e610fb0f69073b34066a5e..e95cd5324f76213fca2a31ba4f21165b0dacb970 100644
--- a/src/components/pages/service-category/ServiceList.js
+++ b/src/components/pages/service-category/ServiceList.js
@@ -2,13 +2,17 @@ import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
 import { Box, Heading, Paragraph, ResponsiveContext } from 'grommet';
 import { useStaticQuery, graphql } from 'gatsby';
+import { DtSquare } from '../../icons';
 import { Container, Column } from '../../layout';
 import { Link } from '../../core';
 import Classification from '../../Classification';
 
 const listQuery = graphql`
   query ServiceListQuery {
-    allMarkdownRemark(sort: { fields: frontmatter___title, order: ASC }) {
+    allMarkdownRemark(
+      sort: { fields: frontmatter___title, order: ASC }
+      filter: { fileAbsolutePath: { regex: "/content/service-detail/" } }
+    ) {
       nodes {
         id
         excerpt
@@ -59,13 +63,16 @@ const ServiceList = ({ categories }) => {
   const isMobile = ['xsmall', 'small'].includes(size);
 
   return (
-    <Box pad={{ vertical: 'large' }}>
+    <Box pad={{ vertical: 'large' }} background="white">
       {catGroup.map((group, i) => (
         <Box key={categories[i]} gap="small">
           {categories.length > 1 && (
             <Container border={isMobile && { size: 'small', side: 'bottom' }}>
               <Column>
-                <Heading level={2}>{categories[i]}</Heading>
+                <Box direction="row" align="center" gap="small">
+                  {!isMobile && <DtSquare color="black" size="small" />}
+                  <Heading level={2}>{categories[i]}</Heading>
+                </Box>
               </Column>
             </Container>
           )}
diff --git a/src/components/pages/solution-detail/SolutionList.js b/src/components/pages/solution-detail/SolutionList.js
new file mode 100644
index 0000000000000000000000000000000000000000..389f5c71530ff0f1da6580a09ab4d763d0e7f50a
--- /dev/null
+++ b/src/components/pages/solution-detail/SolutionList.js
@@ -0,0 +1,95 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Box, Heading, Paragraph, Text } from 'grommet';
+import { useStaticQuery, graphql } from 'gatsby';
+import { Link } from '../../core';
+import Classification from '../../Classification';
+
+const listQuery = graphql`
+  query SolutionsListQuery {
+    allMarkdownRemark(
+      sort: { fields: frontmatter___title, order: ASC }
+      filter: { fileAbsolutePath: { regex: "/content/service-detail/" } }
+    ) {
+      nodes {
+        id
+        excerpt
+        frontmatter {
+          title
+          shortTitle
+          slug
+          categories
+          levels
+          excerpt
+        }
+      }
+    }
+  }
+`;
+
+const ServiceItem = ({ node, pad }) => (
+  <Box basis="1/2" pad="medium">
+    <Heading level={4} margin={{ vertical: 'xsmall' }}>
+      {node.frontmatter.title}
+    </Heading>
+    <Box direction="row" gap="medium" margin={{ bottom: 'medium' }}>
+      {node.frontmatter.categories.map((item) => (
+        <Text key={item} color="dark-1" size="small">
+          {item}
+        </Text>
+      ))}
+    </Box>
+    <Classification levels={node.frontmatter.levels} />
+    {/* Undo this "flex" if we don't want learn more to line up */}
+    <Box flex="grow" pad={{ vertical: pad }}>
+      <Paragraph fill>{node.frontmatter.excerpt || node.excerpt}</Paragraph>
+    </Box>
+
+    <Link to={node.frontmatter.slug}>Learn More ></Link>
+  </Box>
+);
+
+const SolutionList = ({ shoppable, nonShoppable }) => {
+  const {
+    allMarkdownRemark: { nodes },
+  } = useStaticQuery(listQuery);
+
+  const ordered = shoppable.reduce((acc, curr, i) => {
+    const matchingNode = nodes.find((node) => {
+      const matchTitle = node.frontmatter.shortTitle || node.frontmatter.title;
+      return matchTitle === curr;
+    });
+    return [...acc, matchingNode || curr];
+  }, []);
+
+  return (
+    <Box>
+      {ordered.map((node) =>
+        typeof node === 'string' ? (
+          <Box pad="medium" key={node}>
+            <Heading level={4} margin={{ vertical: 'xsmall' }}>
+              {node}
+            </Heading>
+          </Box>
+        ) : (
+          <ServiceItem node={node} key={node.id} />
+        )
+      )}
+      {nonShoppable &&
+        nonShoppable.map((node) => (
+          <Box pad="medium" key={node}>
+            <Heading level={4} margin={{ vertical: 'xsmall' }}>
+              {node}
+            </Heading>
+          </Box>
+        ))}
+    </Box>
+  );
+};
+
+SolutionList.propTypes = {
+  shoppable: PropTypes.array.isRequired,
+  nonShoppable: PropTypes.array,
+};
+
+export default SolutionList;
diff --git a/src/components/pages/solution-detail/index.js b/src/components/pages/solution-detail/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..9ff91fb8dfc47c33e65edf107ff172f57af42ede
--- /dev/null
+++ b/src/components/pages/solution-detail/index.js
@@ -0,0 +1 @@
+export { default as SolutionList } from './SolutionList';
diff --git a/src/components/style-guide/Icons.js b/src/components/style-guide/Icons.js
index 3f5563a9516ba77f1e442de9f1adc9c4d2b63aa9..2a99bbbb3bf6bb06c0818c213c124b991edc42fd 100644
--- a/src/components/style-guide/Icons.js
+++ b/src/components/style-guide/Icons.js
@@ -1,29 +1,68 @@
-import React from 'react';
-import { Box, Heading, Paragraph, Grid } from 'grommet';
-import * as customIcons from '../icons';
-
-const Icons = () => (
-  <Box>
-    <Heading level={2}>Icons</Heading>
-    <Paragraph fill>Some info about how these are made</Paragraph>
-
-    <Grid columns="small" gap="medium">
-      {Object.entries(customIcons).map((icon) => {
-        const Comp = icon[1];
-        return (
-          <Box
-            gap="medium"
-            pad="medium"
-            background="light-1"
-            round="small"
-            direction="row"
-          >
-            <Comp />
-          </Box>
-        );
-      })}
-    </Grid>
-  </Box>
-);
+import React, { useState } from 'react';
+import { Box, Heading, Paragraph, Grid, Text, RangeInput } from 'grommet';
+import * as dtIcons from '../icons';
+
+const Icons = () => {
+  const [size, setSize] = useState(3);
+  const [bg, setBg] = useState(0);
+
+  const sizes = ['small', 'medium', 'large', 'xlarge', '200px'];
+  const colors = ['black', 'light-1', 'white', 'accent-1', 'accent-2'];
+
+  const handleSetSize = (e) => {
+    setSize(Number(e.target.value));
+  };
+
+  const handleSetBg = (e) => {
+    setBg(e.target.value);
+  };
+
+  return (
+    <Box pad={{ vertical: 'large' }}>
+      <Heading level={2}>Icons</Heading>
+      <Paragraph fill>Some info about how these are made</Paragraph>
+      <Box direction="row" gap="medium" pad="medium">
+        <Box width="200px">
+          <RangeInput
+            value={size}
+            onChange={handleSetSize}
+            min={0}
+            max={sizes.length - 1}
+          />
+        </Box>
+        <Text>{sizes[size]}</Text>
+
+        <Box width="200px">
+          <RangeInput
+            value={bg}
+            onChange={handleSetBg}
+            min={0}
+            max={colors.length - 1}
+          />
+        </Box>
+        <Text>{colors[bg]}</Text>
+      </Box>
+
+      <Grid columns="small" gap="medium">
+        {Object.entries(dtIcons).map((icon) => {
+          const Comp = icon[1];
+          return (
+            <Box
+              gap="medium"
+              pad="small"
+              align="center"
+              background={colors[bg]}
+              round="xsmall"
+              key={icon[0]}
+            >
+              <Comp size={sizes[size]} />
+              <Text size="small">{icon[0]}</Text>
+            </Box>
+          );
+        })}
+      </Grid>
+    </Box>
+  );
+};
 
 export default Icons;
diff --git a/src/content/generic/about-us.md b/src/content/generic/about-us.md
index f330390a1133d489a6ee74d8c0d93f845e5520d4..99ca7bf14f7717fe5c5488017085b0586e28b4b5 100644
--- a/src/content/generic/about-us.md
+++ b/src/content/generic/about-us.md
@@ -1,17 +1,35 @@
 ---
 slug: '/about-us'
-title: 'About Us'
+title: About Us
+subtitle: AFLCMC / C3I&N
+description: Learn more about C3I&N's mission and our digital storefront.
+image: '../../images/detail-header.png'
 ---
 
-Paragraph One: Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
+### Our Mission
 
+The C3I&N Directorate is responsible for executing, developing, acquiring, deploying and sustaining cyberspace, communication, cryptologic and space/nuclear network capabilities across Air Force as well as Joint and inter-Agency communities. Our focus is on delivering solutions to drive dynamic integration of information/systems in support of air, space, and cyberspace domains.
 
-#### SRC Benefits
+### What We Provide
 
-- Provides access to SGN capabilities and services to sites where a high degree of operational readiness is not required.
-- Supports access to remote sites and users with different formal access approvals.
-- Increases the ability to communicate SAP and SCI level information with AF, DoD, and Industry partners.
-- Reduces risk of classified information mishandling.
-- Consolidates disparate network architectures.
-- Reduces or eliminates the need to courier or fax classified information.
-- Reduced time and resource costs of building, deploying, and accrediting classified information system.
\ No newline at end of file
+To meet our mission, we offer a broad portfolio of IT services spanning networking, compute & store, digital engineering, and more. Through our scalable, enterprise services, we reduce cost and eliminate duplications of effort across the digital Air Force. Our IT solutions leverage industry best practices to deliver optimal security, performance and end-user experience. Beyond our service offerings, we also own and manage key enterprise IT initiatives, such as EITaaS, SEITaaS and CHES. 
+
+### What is “Digital Trinity?”
+
+Coined by Dr. Will Roper, the Assistant Secretary of the Air Force for Acquisition, Digital Trinity refers to three critical components of modern digital transformation efforts: 
+
+- Agile software development 
+- Modular, open systems architectures
+- Digital engineering
+
+Digital Trinity is meant to foster a virtual acquisition process that centers on creating ‘tech stacks’ that integrate various layers within it and are accessible enterprise-wide as a Service (aaS) to every program, platform, team, and operator. 
+
+### Digital Storefront & Engagement Process
+
+Our digital storefront and engagement process is meant to enable customers to easily find and take advantage of our enterprise IT services.
+
+Our DTE Team supporting this effort is run by AFLCMC/HNJ out of Hanscom AFB. We help match your organization’s IT requirements to the best HN service offerings. Acting as a sort of concierge, our DTE Team leads the engagement from initial consultation through configuration and delivery.
+
+### Help Improve Our Beta Website
+
+We welcome feedback to help improve our storefront, engagement process and IT services. Let us know your thoughts.
diff --git a/src/content/generic/other-programs.md b/src/content/generic/other-programs.md
deleted file mode 100644
index 41a11c2caa7426c703b3752dbc272bdc18ee005e..0000000000000000000000000000000000000000
--- a/src/content/generic/other-programs.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-slug: '/other-programs'
-title: 'Our Other Programs'
----
-
-Paragraph One: Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-
-#### SRC Benefits
-
-- Provides access to SGN capabilities and services to sites where a high degree of operational readiness is not required.
-- Supports access to remote sites and users with different formal access approvals.
-- Increases the ability to communicate SAP and SCI level information with AF, DoD, and Industry partners.
-- Reduces risk of classified information mishandling.
-- Consolidates disparate network architectures.
-- Reduces or eliminates the need to courier or fax classified information.
-- Reduced time and resource costs of building, deploying, and accrediting classified information system.
\ No newline at end of file
diff --git a/src/content/other-programs/ches.md b/src/content/other-programs/ches.md
new file mode 100644
index 0000000000000000000000000000000000000000..73fedef3a54974194afe42811b3ad098262def44
--- /dev/null
+++ b/src/content/other-programs/ches.md
@@ -0,0 +1,12 @@
+---
+name: CHES
+index: 2
+---
+
+### Cloud-hosted enterprise services (CHES)
+
+#### Office 365
+
+#### SharePoint
+
+#### Teams
\ No newline at end of file
diff --git a/src/content/other-programs/eitaas.md b/src/content/other-programs/eitaas.md
new file mode 100644
index 0000000000000000000000000000000000000000..a9b86425c55096cfde2c4d047568157ea7f90574
--- /dev/null
+++ b/src/content/other-programs/eitaas.md
@@ -0,0 +1,35 @@
+---
+name: EITaaS
+index: 1
+---
+### EITaaS
+
+**Cloud Compute & Store**
+Compute & Store (C&S) provides secure access to cloud computing services, improving responsiveness to warfighter needs with faster access to systems and data for a more reliable, secure, consistent access to systems, data and just in time capacity for storage.
+
+**End-User Devices**
+Users will be able to select government funded equipment through an online service portal, to include: desktops, laptops, mobile devices, thin clients, zero clients, and smart devices.
+
+**Video Teleconferencing (VTC)**
+These services are comprised of the hardware, software, network, and scheduling components necessary to deliver real-time video and audio communications between end users at two or more locations. This includes the operation and maintenance of the VTC service.
+
+**Messaging**
+EITaaS EUS connects to existing messaging services (like CHES Teams) while providing new devices supported by overall IT Service Management (ITSM).
+
+**Voice/VoIP**
+Voice/VoIP is a capability that enables and allows users to communicate over IP Telephony, providing a secure and reliable voice network that enables access to DoD classified and unclassified data. Currently, VOIP implementation is only approved at Offutt AFB.
+
+**Network-as-a-Service (NaaS) –  WAN**
+A geographically distributed private telecommunications network that interconnects multiple local area networks (LANs). This includes connections into Microsoft’s Azure for Government (MAG)/Office 365 Government Community Cloud, third-party cloud services, the internet and back into legacy Air Force and military networks.
+
+**Network-as-a-Service (NaaS) –  BAN**
+Base Area Network (BAN) is a commercially designed network that is optimized, secure and robust, and contributes to an end-state that enables the concept of the ‘Mobile Airman.’ BAN is both wired and wireless and comprises of the following offerings: 
+- Inside Plant/Outside Plant: Inside Plant is defined as network transport (copper and fiber) within a building; Outside Plant is defined as network transportation (copper and fiber) outside a building (e.g. buried or aerial cable). A fully integrated access to BAN services for devices will provide a seamless UX.
+- Wireless: Fully integrated wireless access to BAN services for wireless-enabled devices (including MFD connectivity) to provide a seamless user experience regardless of how the device is connected.
+- Wired: Secure wired access to the commercial internet.
+- Cellular: Commercial infrastructure.
+
+**Network-as-a-Service (NaaS) – Remote Connect**
+
+**Security Operations Center (SOC)**
+The ESOC conducts security and defense operations in partnership with the 16 AF, 616 OC, and AF SOC/33 NWS. It integrates commercial capabilities with the 16 AF to conduct security incident response, with goals to automate security incident response, decrease response time, increase detection, and increase true positive rate of automation against incidents/events.
diff --git a/src/content/other-programs/more.md b/src/content/other-programs/more.md
new file mode 100644
index 0000000000000000000000000000000000000000..062e3ba1efa8dda8cac57726bf43d7eca6bfccd8
--- /dev/null
+++ b/src/content/other-programs/more.md
@@ -0,0 +1,14 @@
+---
+name: More
+index: 3
+---
+### More
+
+**Air Force Portal**
+Online platform that allows users to quickly find authoritative, relevant data and information, applications and collaboration tools to help with tasks related to USAF jobs and life.
+
+**Enterprise IT Service Management**
+Enterprise IT Service Management System (EITSM) is an enterprise toolset to manage all IT support processes within an integrated ITSM environment.  EITSM supports over 850,000 customers with accounts on NIPR and SIPR environments.  The EITSM system is web-based with two physical locations at INOSC East (83 NOS) (NIPR/SIPR) and INOSC West (561 NOS)(NIPR. EITSM primarily provides incident and change management functionality.
+
+**Emergency Mass Notification System (EMNS)**
+The Emergency Mass Notification System (EMNS) service delivers emergency communications and critical alerts. The EMNS send notices to the Air Force populace through desktop, mobile application, telephone, text messaging alerts, and giant voice. This system provides individuals with near real-time notifications sent directly from the AF/MAJCOM/Installation command posts.
diff --git a/src/content/other-programs/security.md b/src/content/other-programs/security.md
new file mode 100644
index 0000000000000000000000000000000000000000..fbb4a3bad834492d9621bc9276d3317eea0140b9
--- /dev/null
+++ b/src/content/other-programs/security.md
@@ -0,0 +1,66 @@
+---
+name: Security
+index: 0
+---
+### Security
+
+**AF Cyberspace Defense**
+Coordinates and executes resources needed to assess, analyze, and respond to AF network security incidents, intrusive activity, malicious logic (i.e., viruses) and vulnerabilities.  It is also a key capability employed by 16AF in its Cyber Security Service Provider (CSSP) role.  Lastly, the program administers ELICSAR, the AF’s Cyber BDP.  
+
+**AF Directory Services - Single Digital Identity Record**
+Harvests identity data from multiple, authoritative data sources to create a single consolidated digital identity record. Provides contact data synchronization between all MAJCOMs, AF supported COCOMs and other organizations resulting in an AF-Enterprise wide Global Address List distribution service. Daily synchronization of contacts to AFIN, MAJCOMs, Combatant Commands, and DoD Organizations.
+
+**AF Vulnerability Management**
+Provides EndPoint security.  ARAD provides AFNet endpoint management tool capable of examining and modifying enterprise clients in real time. ACAS is an integrated software solution that provides automated network vulnerability scanning, configuration assessment, and network discovery.  ESS is an Air Force (AF) enterprise-wide automated, standardized Information Assurance tool that enhances end-point system security against internal/external threats and implements AF security policies on all end-host systems.
+
+**Cyber Defense Analysis**
+Monitors, collects, analyzes and reports on information transmitted via unsecured telecommunications systems (telephony, radio frequency, E-mail and internet-based capabilities) for Network Defense, OPSEC and Force Protection
+
+**Cyber Vulnerability Assessment/Hunter**
+Identifies, characterizes, and mitigates cyberspace threats impacting critical operational capabilities within Air Force and DoD Networks. It also provides advanced calculated defensive missions or rapid response (i.e. Quick Response Forces ) engaging adversaries operating within the AF/DoD network via a blended approach to agility, precision employment, engagement tactics, techniques and procedures (TTP). Deployable capability with multiple tools to interrogate hosts to identify vulnerabilities and/or adversary actions on the end point. CVA/H also has advanced end point protection capabilities to prevent adversary actions on the end point.
+
+**Enterprise Logging Ingest and Cyber Situational Awareness Refinery (ELICSAR)**
+The AF’s cyber Big Data Platform (BDP).  Utilizes cloud infrastructure to ingest various data types from the AFIN.  In turn, defensive cyber analyst can perform complex analytics against the data to identify and then take action against advanced cyber threats.
+
+#### Command and Control Integration
+
+**AFNet Gateways**
+Strategic entry points for Internet and DODIN network traffic. Includes Gateway Decommissioning project (forecast completion September 2022), Gateway dependency elimination (L3VPN, Guest Network), Gateway sustainment, replacement of IBM 3850 servers (now supported by Lenovo), and L3VPN Encryption Relief (for transition to JRSS/JIE environment)
+
+**Integrated Management Suite (IMS)**
+The out-of-band management network operated by 26 NOS, 33 NWS (ACD Weapon System) and used by 83rd, 561st and 299th (CSCS) in order to manage remote network health and cybersecurity devices across the AFNet. We provide network logging and SIEM to DCO Operators. 
+IMS includes the following projects:
+- IMS Expansion Effort to upgrade throughput to 10Gbps, firewall capacity, Splunk infrastructure, and Active Directory Collapse (forecast completion Feb 2021)
+- Identity Automated Access Management (IAAM) An application allowing 26 NOS to manage ~1500 network administrator accounts supporting ACD, AFINC and CSCS, 38th, AFSN, and OSI
+- Agile Development Support of CS&D (ACD) Mod to IMS, EL2 effort places NIFI servers in the IMS enclave to deliver event logs to the Cloud for DCO cyber defense remediation.
+
+#### ICAM
+
+**Identity Management**
+The service provides the practices that establish, maintain, and terminate identities within the enterprise bringing together identities with authenticators and attributes for the enterprise.
+
+**Credential Management**
+The service provides the mechanisms to manage the life cycle of credentials that a user possesses and controls from creation through destruction. Credentials and authenticators verify a user’s identity and are used to authenticate when requesting access to resources.
+
+**Access Management**
+The service provides the method for gaining access to resources (applications, services, systems, etc.). It provides a centralized capability for validating permissions and privileges via the credentials presented by the user.
+
+**Federation**
+This service enables one organization to accept another organizations identity through inter-organizational trust of policies and practices.
+
+**Governance**
+This service provides a method of identifying and enforcing policy based on documented STIGS, memorandums, instructions, etc., as well as specific application criteria like separation of duties, rights of least privileges, etc. These policies and rules for procedure validation will enable an organization to administer and support ICAM capabilities.
+
+#### Public Key Infrastructure (PKI)
+
+**Certificate issuance for devices and people**
+We are the responsible authority for all certificate issuance issues and policy concerns regarding issuance within in AF. We also manage issuance locations across AF and support building and deployment of internal AF PKI for non-DoD supported devices.
+
+**Integration and extension of DoD PKI capabilities into AF**
+The AF PKI program extends the DOD PKI capabilities for use with in the AF.  This includes enterprise capabilities for certificate revocation checking, issuance of primary and alternate people tokens, automated certificate issuance to non-person entities, and other DoD capabilities.
+
+**Operations and maintenance of AF PKI components**
+We manage all AF components of PKI and DOD integration, operate the issuance capabilities within AF, and address the needs for new capabilities.
+
+**Public Key Enabling engineering support (includes second-factor authentication)**
+We work with application and program managers to support implementations of PKI-based user authentication.
diff --git a/src/content/service-category/hosting-infrastructure.md b/src/content/service-category/hosting-infrastructure.md
index 1e5f6fe9d73a06acf7979822eb6f729752204c51..484362924b41d8c04fb528a0c17201671eba08b9 100644
--- a/src/content/service-category/hosting-infrastructure.md
+++ b/src/content/service-category/hosting-infrastructure.md
@@ -1,8 +1,10 @@
 ---
 slug: '/hosting-infrastructure'
-title: 'Hosting Infrastructure'
-categories: ['Hosting Infrastructure']
-image: '../../images/c-one-hero.png'
+title: 'Compute and Store'
+categories:
+  - Compute & Store
+image: '../../images/cat-header-comp-store.png'
+icon: DtComputeStore
 ---
 
-Provides access to modernized, standard, secure, and resilient IT infrastructure and platforms to support application workload and data storage. Portfolio aims to provide Joint Information Environment complaint enterprise and/or local application and data hosting.
\ No newline at end of file
+We seek to provide access to modernized, standard, secure, and resilient IT infrastructure and platforms to support Joint Information Environment-compliant enterprise and local application and data hosting.
\ No newline at end of file
diff --git a/src/content/service-category/networking-connectivity.md b/src/content/service-category/networking-connectivity.md
index 0fcf43d3cf2d22a79c8b7f49f1d61dffdd2bfb12..9767e1e52c1da2d7ed01b1d8526cf96a837b4c94 100644
--- a/src/content/service-category/networking-connectivity.md
+++ b/src/content/service-category/networking-connectivity.md
@@ -1,8 +1,14 @@
 ---
 slug: '/networking-connectivity'
 title: 'Networking & Connectivity'
-categories: ['Global Networking / WAN', 'Local Networking / BAN', 'Cloud Access', 'Reference Architectures', 'Voice / VoIP']
+categories:
+  - Global Connectivity / WAN
+  - Local Connectivity / BAN
+  - Cloud Access
+  - Reference Architectures
+  - Virtual Private Connections
 image: '../../images/cat-header.png'
+icon: DtNetConn
 ---
 
 Provides access to modernized, standard, secure, and resilient IT infrastructure and platforms to support application workload and data storage. Portfolio aims to provide Joint Information Environment complaint enterprise and/or local application and data hosting.
\ No newline at end of file
diff --git a/src/content/service-detail/af-vul-mgmt.md b/src/content/service-detail/af-vul-mgmt.md
deleted file mode 100644
index 52cc816bc8db2eb27aab856e0c83d9f16accfdcc..0000000000000000000000000000000000000000
--- a/src/content/service-detail/af-vul-mgmt.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-slug: /services/af-vulnerability-mgmt
-title: AF Vulnerability Management
-categories:
-  - Security
-levels: 
-  - TS-SCI
----
-
-Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
diff --git a/src/content/service-detail/af7.md b/src/content/service-detail/af7.md
index 3a78d1f258aeea1af492c9f4d0d340d3273ee649..6e6269b2b23d331cf28c7431b865f0a1a3940147 100644
--- a/src/content/service-detail/af7.md
+++ b/src/content/service-detail/af7.md
@@ -1,25 +1,29 @@
 ---
 slug: '/services/af7'
-title: 'AF7'
-subtitle: 'SIPR video conferencing platform'
-categories: ['Productivity & Collaboration']
-levels: ['SEC-COLL']
+title: 'Air Force Special Enclave Video Enterprise Network (AF7)'
+shortTitle: 'AF7'
+categories:
+  - Communications
+levels:
+  - S-SAR
+  - TS-SAR
+  - TS-SCI
+excerpt: 'AF7 provides users the latest in secure video technology to allow real-time video and audio communications around the world.'
+updated: March 23, 2021 at 2:54:52 PM EDT
 ---
 
-Paragraph One: Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
+AF7 system is a network of geographically dispersed user video teleconferencing (VTC) sites connected to two mission support centers and operated at three security levels cleared for special access required (SAR) VTCs: Secret//SAR Level 3, Top Secret//SAR Level 4, and Top Secret//SAR-SCI Level 5.
 
-## Heading Level Two
+### Benefits & Features
 
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
+- Approved for all DoD SAPs.
+- Can be installed at contractor sites.
+- No ATC required. Deployment approval signed off by PM and ISSM.
+- Significantly cuts TDY costs.
+- Endpoint Tech Refresh (Gov' t/Con tractor) paid for by AF7 PMO.
+- Fielded Cisco VTC endpoint equipment covered under USAF Joint Enterprise License Agreement.
 
-### Heading Level Three
+### Requirements
 
-Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat
-
-- Apple
-- Banana
-- Cherry
-- Grapes
-- Mango
-
-> Pull quote: Interdum et malesuada fames ac ante ipsum primis in faucibus. Mauris eget scelerisque tellus. Proin semper lacus eget sem volutpat congue. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Quisque tristique erat id nisl sodales egestas.
+- AF 1067 or ITNR
+- Deployment Approval Package
\ No newline at end of file
diff --git a/src/content/service-detail/afsen-coin.md b/src/content/service-detail/afsen-coin.md
index 853f44f2e221581d3048b6ae0d20a0f060ed3fb0..9786cbe3fff2ff884f48dd56314301d2df33782c 100644
--- a/src/content/service-detail/afsen-coin.md
+++ b/src/content/service-detail/afsen-coin.md
@@ -1,13 +1,12 @@
 ---
 slug: '/services/afsen-coin'
 title: 'AFSEN COIN'
-categories: ['Networking & Connectivity', 'Global Networking / WAN']
-levels: ['SEC-SAP']
-excerpt: 'Custom Description: SGN is an Air Force Special Access Program (SAP) network approved Top Secret Secure Compartmentalized Information (SCI) processing, SGN allows sites to communicate by using VoIP phones, Email, File sharing, and other capabilities'
+shortTitle: 'COIN'
+categories:
+  - Networking & Connectivity
+  - Global Connectivity / WAN
+excerpt: 'AFSEN-COIN is designed to provide a standardized means of information transportation to improve service and connectivity between locations.'
+updated: March 23, 2021 at 2:54:52 PM EDT
 ---
 
-Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
\ No newline at end of file
+AFSEN-COIN is a Virtual Private Network (VPN) service provided through the Defense Information Systems Agency (DISA) Global Information Grid (GIG). AFSEN-COIN provides the transport pipe for Secret//Special Access Required (SAR) up to Top Secret Sensitive Compartmented Information (SCI)//SAR traffic that is National Security Agency (NSA) Type-1 encrypted using DISA’s Layer 3-VPN service for long-haul transport. AFSEN-COIN provides customers with dedicated transport/bandwidth for Special Access Program (SAP) missions without having to compete with existing NIPRNet bandwidth. Private Network (VPN) service provided through the Defense Information Systems Agency (DISA) Global Information Grid (GIG). AFSEN-COIN provides the transport pipe for Secret//Special Access Required (SAR) up to Top Secret Sensitive Compartmented Information (SCI)//SAR traffic that is National Security Agency (NSA) Type-1 encrypted using DISA’s Layer 3-VPN service for long-haul transport. AFSEN-COIN provides customers with dedicated transport/bandwidth for Special Access Program (SAP) missions without having to compete with existing NIPRNet bandwidth.
diff --git a/src/content/service-detail/base-it.md b/src/content/service-detail/base-it.md
index dc2b53083d87b4c7c3b3cb2f4717bacae3c8be67..f68ec0b9fb4b76e735129ba7afefdd41c6a85d5d 100644
--- a/src/content/service-detail/base-it.md
+++ b/src/content/service-detail/base-it.md
@@ -1,12 +1,31 @@
 ---
 slug: '/services/base-it-infrastructure'
 title: 'Base IT Infrastructure'
-categories: ['Networking & Connectivity', 'Local Networking / BAN']
-levels: ['SEC-SCI']
+shortTitle: 'BITI'
+categories:
+  - Networking & Connectivity
+  - Local Connectivity / BAN
+  - Global Connectivity / WAN
+levels: 
+  - U
+  - S
+excerpt: 'Base IT Infrastructure services are centrally managed to provide both wired and wireless WAN and BAN capabilities.'
+updated: March 23, 2021 at 2:54:52 PM EDT
 ---
 
-Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
+**Wired**
+- All switches, critical and non-critical, to be replaced with improved technology.
+- Software Defined Networking (SDN) capable
+- Enhanced network security (802.1x, 2FA)
 
-## Heading Level Two
 
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
+**Wireless**
+- Replacement/addition of facility wireless and flight-line wireless.
+- Wi-Fi 6 capable 
+- Citizens Broadband Radio Service (CBRS) capable (flight-line only)
+- Private/Public/5G LTE delivery (flight-line only)
+
+**Centralized Management**
+- Deploy centralized management system for management of wireless, wired and deployment of security policies.
+- Enables future deployment of SDN and Zero Trust capabilities.
+- Enables single focal point for managed service component.
diff --git a/src/content/service-detail/cloud-based-compute.md b/src/content/service-detail/cloud-based-compute.md
deleted file mode 100644
index bc23a1065b258c20b16b983c7398617e45313ef8..0000000000000000000000000000000000000000
--- a/src/content/service-detail/cloud-based-compute.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-slug: '/services/cloud-based-compute'
-title: 'Cloud-Based Compute & ???'
-categories: ['Hosting Infrastructure']
-levels: ['SEC-COLL']
----
-
-Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
\ No newline at end of file
diff --git a/src/content/service-detail/cloud-gateway.md b/src/content/service-detail/cloud-gateway.md
index 5c6649f69c261cb03097e764967780c7361aa4ba..2a7168fb42f2e51686966cb8205bf44d25adc763 100644
--- a/src/content/service-detail/cloud-gateway.md
+++ b/src/content/service-detail/cloud-gateway.md
@@ -1,12 +1,10 @@
 ---
 slug: '/services/cloud-gateway'
 title: 'Cloud Gateway'
-categories: ['Networking & Connectivity', 'Cloud Access']
-levels: ['SEC-SAR']
+categories:
+  - Network & Connectivity
+  - Cloud Accesslevels
+excerpt: 'Cloud Gateway provides access to approved SAP Clouds & Services, SAP Meet Me Point (MMPs), and COMSEC collocation by offering high speed Cloud access and leverages common transports. It is tailored towards DoD SAP and ICON Defense Industrial Based (DIB) participants'
+updated: March 23, 2021 at 2:54:52 PM EDT
 ---
 
-Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
diff --git a/src/content/service-detail/cloud-one-pipeline.md b/src/content/service-detail/cloud-one-pipeline.md
new file mode 100644
index 0000000000000000000000000000000000000000..db2caa523069a1882464368b9d9925647c30f96e
--- /dev/null
+++ b/src/content/service-detail/cloud-one-pipeline.md
@@ -0,0 +1,9 @@
+---
+slug: '/services/cloud-one-pipeline'
+title: 'Cloud One Pipeline'
+categories:
+  - Software Development
+  - DevSecOps
+updated: March 23, 2021 at 2:54:52 PM EDT
+---
+
diff --git a/src/content/service-detail/cloud-one.md b/src/content/service-detail/cloud-one.md
index f9d8ad1c767332047f71b8bc4406e41cdfbf73f5..dd8a01a038c6d2fb170636618f2c4bb9b18864da 100644
--- a/src/content/service-detail/cloud-one.md
+++ b/src/content/service-detail/cloud-one.md
@@ -2,59 +2,32 @@
 slug: '/services/cloud-one'
 title: 'Cloud One'
 categories:
-  - Hosting Infrastructure
+  - Compute & Store
 levels:
-  - Unclass
-  - TS-SAP
-excerpt: 'This is some short text'
+  - U
+  - S
+excerpt: 'The ‘one-stop-shop’ for Air Force cloud computing, Cloud One provides cloud environments in AWS and Azure.  As the enterprise solution, Cloud One embraces automated deployments to stand-up cloud environments at scale. '
+updated: March 23, 2021 at 2:54:52 PM EDT
 ---
 
-Paragraph One: Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
+##### Secure Cloud Hosting Platform
+Cloud One delivers the secure cloud hosting platform from development to production that mission systems need to cost-efficiently deliver capability to the warfighter. Cloud One delivers that platform across multiple impact levels and clouds with inheritable controls and common services that enable DevSecOps and quick cloud adoption.
 
+##### Cloud Onboarding
+Cloud One engages with customers across a variety of mediums to ensure that mission owners have the information needed to effectively rationalize, plan, and budget for a cloud journey.
 
-#### SRC Benefits
+##### Migration as a Service
+Cloud One provides the migration service to quickly and cost effectively transition workloads to commercial clouds. By providing the processes, expertise and contract, Cloud One delivers to mission owners the promise of cloud computing while avoiding common migration pitfalls.
 
-- Provides access to SGN capabilities and services to sites where a high degree of operational readiness is not required.
-- Supports access to remote sites and users with different formal access approvals.
-- Increases the ability to communicate SAP and SCI level information with AF, DoD, and Industry partners.
-- Reduces risk of classified information mishandling.
-- Consolidates disparate network architectures.
-- Reduces or eliminates the need to courier or fax classified information.
-- Reduced time and resource costs of building, deploying, and accrediting classified information system.
-
-#### Connecting to SGN
-
-- Via an existing unclassified network (i.e. NIPRNET, COIN or Commercial ISP)
-- Contractor systems must work with their Contracting Officer and government sponsor to establish a network connection
+##### Data Transport
+Access to data is one of the driving factors for cloud adoption. Cloud One provides secure, performative data transport capabilities to access clouds, and then keeps data flowing between systems in the cloud(s) and on-premise.
 
 ### Benefits and Features
 
-- Communication between AF, DoD, and Industry partners
-- SAP TS/SCI level information sharing
-- Multi-level and compartment communications
-- Email and File sharing functionality via CORE and SIC services
-- Access to JADE personnel adjudication database
-- Computing devices
-- Printing
-- VoIP phone communications
-
-### Requirements
-
-- Approved Secure Facility
-- Approved 1067 or IT Network Request
-- Completed Requirements Questionnaire
-
-### Add-on Capabilities
-
-Computing devices
-
-VoIP phone communications
-
-Printing
-
-[Service Name 4](/services/platform-one)
-
-[Service Name 5](/services/starburst)
+- **Common Computing Environment** – We provide the guardrails to the cloud in a standard manner so you can focus on your mission.
+- **Single, Federated, MFA Security Tier** – There is one login across all logins with one user that all management applications leverage, no secondary logins, and non-elevated machine accounts. Fully audited for all management activities.
+- **Fully Automated** – All environmental stand-up is managed by automation scripts drastically speeding up deployment, reducing manual work, and human error.
+- **Proactive Scaling & System Monitoring** – Mission Owners can see all operational metrics and provide rules and alerts to manage each mission their way.
+- **DevSecOps Focused** – Secure, mission driven deployments are built into the framework to ensure self-service and seamless deployments.
 
 
-> Pull quote: Interdum et malesuada fames ac ante ipsum primis in faucibus. Mauris eget scelerisque tellus. Proin semper lacus eget sem volutpat congue. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Quisque tristique erat id nisl sodales egestas.
diff --git a/src/content/service-detail/cnap.md b/src/content/service-detail/cnap.md
deleted file mode 100644
index 8c6111531233208e88bc8d1858a53eec219a22bc..0000000000000000000000000000000000000000
--- a/src/content/service-detail/cnap.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-slug: '/services/cnap'
-title: 'Platform One Cloud Native Access Portal (CNAP)'
-categories: ['Networking & Connectivity', 'Cloud Access']
-levels: ['Unclass', 'TS-COLL']
----
-
-Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
diff --git a/src/content/service-detail/core-rock.md b/src/content/service-detail/core-rock.md
new file mode 100644
index 0000000000000000000000000000000000000000..f5262e57a17fc81fb831b03ea30857eade6dd75c
--- /dev/null
+++ b/src/content/service-detail/core-rock.md
@@ -0,0 +1,37 @@
+---
+slug: '/services/core-rock'
+title: 'CORE (Rock)'
+categories: 
+  - Communications
+levels: 
+  - S-SAR
+  - TS-SAR
+  - TS-SCI
+excerpt: 'CORE is a suite of multi level web applications that provide file share and webmail services enabling secure data and communication exchange between S//SAR, TS//SAR, and TS//SAR-SCI networks and users.'
+updated: March 23, 2021 at 2:54:52 PM EDT
+---
+
+CORE is an Air Force Special Access Program (SAP) suite of services approved for S//SAR, TS//SAR, and TS//SAR-SCI mail and file share.  DoD, AF, industry partners can utilize the capability.  
+
+
+### Benefits & Features
+
+- Increased communication with AF, DoD, and industry
+- Reduces human errors of data transfer
+- Consolidates disparate architectures
+- Eliminates secure faxing and human courier time
+- Webmail service
+	- Adapts based on user clearances
+	- No limit on inbox size
+	- Attach files
+- Cloud-based file transfer
+	- Multi-level Compartmentalization
+	- Adapts based on user clearances
+- 3rd Party Introduction
+	- User SAP accesses pulled from JADE
+	- Strips PII information for general users
+	
+### Requirements
+
+All necessary forms are provided by the Rock Connections Team
+
diff --git a/src/content/service-detail/d1scovery.md b/src/content/service-detail/d1scovery.md
new file mode 100644
index 0000000000000000000000000000000000000000..a7057c54b441e40c08b9a77dbd9d4cd33114b0ad
--- /dev/null
+++ b/src/content/service-detail/d1scovery.md
@@ -0,0 +1,39 @@
+---
+slug: '/services/d1scovery'
+title: 'D1scovery'
+categories: 
+  - Data Analysis
+levels: 
+  - U
+excerpt: 'An enterprise Big Data Analytics platform hosted on Cloud One that provides advanced data analytics and data management tools up to IL4.'
+updated: March 23, 2021 at 2:54:52 PM EDT
+---
+
+D1scovery provides an operational environment for analytics-based solutions and gives users access to cutting-edge commercial business intelligence and advanced data analytics tools and environment on Microsoft’s Azure Government Cloud.
+
+
+### Benefits & Features
+
+**Benefits**
+- Reduce cost and time needed to field Data Analytics Solutions with Data Lab sandbox to test analyses and draft solutions. 
+- Publish vetted analytic solutions that can be shared with any CAC user via URL 
+- Access a metadata catalog and Data Specialists to explore over 50 data sources and existing solutions 
+- Apply the latest Cloud native Data Analytic services, including Data Factory, Synapse, Spark, and PowerBI 
+- Exploit the data analytics working environment and automated DevSecOps processes to deliver your proven solutions 
+- Utilize a comprehensive knowledge portal and on-demand toolbox resources to reduce training and start-up time.
+
+**Available Features**
+- Apache MiFI
+- Apache Spark
+- Azure Data Factory
+- Data Shuttle
+- Data Storage - Structured
+- Data Storage - Unstructured
+- Data Visualization
+- DataFactory
+- HDInsight
+- Informatica PowerCenter
+- Infrastructure as Code (IaC)
+- Management Console
+- ML Workstation
+- Python
diff --git a/src/content/service-detail/digi-eng-platform.md b/src/content/service-detail/digi-eng-platform.md
deleted file mode 100644
index bd3f2d1491870179d9cfa33b29549758b1ae7465..0000000000000000000000000000000000000000
--- a/src/content/service-detail/digi-eng-platform.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-slug: '/services/digital-engineering-platform'
-title: 'Digital Engineering Platform'
-categories: ['Productivity & Collaboration']
-levels: ['SEC-COLL', 'TS-SCI']
----
-
-Paragraph One: Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
-
-### Heading Level Three
-
-Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat
-
diff --git a/src/content/service-detail/digital-engineering-platform.md b/src/content/service-detail/digital-engineering-platform.md
new file mode 100644
index 0000000000000000000000000000000000000000..e02427bc5f48823c1f5c9c1fced184c77afb1d4d
--- /dev/null
+++ b/src/content/service-detail/digital-engineering-platform.md
@@ -0,0 +1,26 @@
+---
+slug: '/services/digital-engineering-platform'
+title: 'Digital Engineering Platform'
+shortTitle: 'DE Platform'
+categories: 
+  - Digital Engineering
+levels: 
+  - U
+excerpt: 'Popular Digital Engineering and collaboration software tools offered in a platform-as-a-service (PaaS) model.'
+updated: March 23, 2021 at 2:54:52 PM EDT
+---
+
+The Department of Defense is transforming engineering practices to digital engineering, incorporating technological innovations into an integrated, digital, model-based approach to ensure continued U.S. technological superiority.
+
+- Implementation of digital engineering across the Department of Air Force will accelerate the transition of advanced technologies.
+- The Digital Engineering Platform as a Service (DEPaas) effort is a virtual private cloud (VPC) that integrates digital engineering and collaboration tools into a common environment. 
+
+
+### Benefits & Features
+
+- Cameo Requirements Modeler
+- Confluence
+- Jira
+- Tools to build models & diagrams
+- All delivered in preconfigured workspaces in a Cloud One enclave
+
diff --git a/src/content/service-detail/elicsar.md b/src/content/service-detail/elicsar.md
deleted file mode 100644
index 6353c4de525587e8770f1640a0ab41289455fdb1..0000000000000000000000000000000000000000
--- a/src/content/service-detail/elicsar.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-slug: '/services/elicsar'
-title: 'ELICSAR'
-categories: ['Security']
-levels: ['SEC-COLL']
----
-
-Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
\ No newline at end of file
diff --git a/src/content/service-detail/emns.md b/src/content/service-detail/emns.md
deleted file mode 100644
index 7146f7f115301caffb566c610aec8a44d74fb206..0000000000000000000000000000000000000000
--- a/src/content/service-detail/emns.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-slug: '/services/emns'
-title: 'Emergency Mass Notification System (EMNS)'
-categories: ['Communications']
-levels: ['SEC-COLL']
----
-
-Paragraph One: Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
-
-### Heading Level Three
-
-Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat
-
diff --git a/src/content/service-detail/enterprise-virtual-environment-eve.md b/src/content/service-detail/enterprise-virtual-environment-eve.md
new file mode 100644
index 0000000000000000000000000000000000000000..857b3be7210d8097e46a7f780c5713e626f9cbe3
--- /dev/null
+++ b/src/content/service-detail/enterprise-virtual-environment-eve.md
@@ -0,0 +1,21 @@
+---
+slug: '/services/enterprise-virtual-environment'
+title: 'Enterprise Virtual Environment (EVE)'
+shortTitle: 'EVE'
+categories: 
+  - Compute & Store
+levels: 
+  - S-SAR
+  - TS-SAR
+  - TS-SCI
+excerpt: 'A government owned/government operated hardware solution that provides a basic compute and store capability in a PL-3 environment.'
+updated: March 23, 2021 at 2:54:52 PM EDT
+---
+
+This infrastructure-as-a-service (IaaS) model allows EVE to host virtualized systems and field services supporting the USAF and DoD. EVE supports both Level 3 and Level 4/5 production mission systems.
+
+### Benefits & Features
+
+- BYOAD
+- Data Storage
+- Management Console
\ No newline at end of file
diff --git a/src/content/service-detail/eve.md b/src/content/service-detail/eve.md
deleted file mode 100644
index 412ef71b5c779d78f7437218faad2d8e2a30938c..0000000000000000000000000000000000000000
--- a/src/content/service-detail/eve.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-slug: '/services/enterprise-virtual-environment'
-title: 'Enterprise Virtual Environment (EVE)'
-categories: ['Hosting Infrastructure']
-levels: ['SEC-COLL']
----
-
-Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
\ No newline at end of file
diff --git a/src/content/service-detail/fences.md b/src/content/service-detail/fences.md
index f83854dca11aeae1432f1e8110cc336ab0115ddf..f7512dc9bbaa40e4d5db8cf4f0455562559a6f45 100644
--- a/src/content/service-detail/fences.md
+++ b/src/content/service-detail/fences.md
@@ -2,14 +2,16 @@
 slug: /services/fences
 title: FENCES
 categories:
-  - DevSecOps
-  - Hosting Infrastructure
+  - Compute & Store
 levels:
-  - SEC-COLL
+  - S
+  - S-SAR
+  - S-SCI
+  - TS
+  - TS-SAR
+  - TS-SCI
+excerpt: 'FENCES is the only SAP-compliant enterprise cloud solution for the DoD at independent levels of security.'
+updated: March 23, 2021 at 2:54:52 PM EDT
 ---
 
-Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
\ No newline at end of file
+FENCES provides PL-2 workload templates for SAP customers that easily provide virtual desktops, DevSecOps, modeling & simulation, edge computing, and data backup capabilities. These workload templates are available across every security level to simplify development and migration of mission applications for SAP data.
diff --git a/src/content/service-detail/icon.md b/src/content/service-detail/icon.md
index 4afd9bdfe524c317833f83bda767b76b724a851e..19495c27b8ea71295ce9d00eaaf8a96c3ae0c5a2 100644
--- a/src/content/service-detail/icon.md
+++ b/src/content/service-detail/icon.md
@@ -1,12 +1,20 @@
 ---
 slug: '/services/icon'
 title: 'Industry Connections (ICON)'
-categories: ['Networking & Connectivity', 'Reference Architectures']
-levels: ['SEC-COLL']
+shortTitle: 'ICON'
+categories: 
+  - Networking & Connectivity
+  - Reference Architectures
+excerpt: 'ICON is a reference architecture for industry partners to build out their own PL-3 networks to connect to FENCES or Summit.'
+updated: March 23, 2021 at 2:54:52 PM EDT
 ---
 
-Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
+ICON connect industry to DoD’s Enterprise SAP Services (SWS) and cloud environment by providing a standardized architecture, security, cyber and operations across industry through the ICON Reference Architecture. 
 
-## Heading Level Two
+ICON addresses the following problems to allow programs to focus on the mission, not on IT:
+
+- Low availability and standalone systems
+- No NIPR/SIPR/JWICS-like SAP network
+- No persistent government security
+- Redundant, inefficient and costly networks
 
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
diff --git a/src/content/service-detail/mattermost.md b/src/content/service-detail/mattermost.md
index 4372beb6df4a3ff5b25822690af1cfc0457f7487..476361987d96959389c74fae304bccea9f63c20d 100644
--- a/src/content/service-detail/mattermost.md
+++ b/src/content/service-detail/mattermost.md
@@ -1,17 +1,12 @@
 ---
 slug: '/services/mattermost'
 title: 'Mattermost'
-categories: ['Productivity & Collaboration']
-levels: ['SEC-COLL']
+categories: 
+  - Communications
+levels: 
+  - U
+excerpt: 'Mattermost is an FOUO chat/messaging client developed by Platform One primarily to allow communication between developers on its platform without requiring CAC. Available for use by all of DoD.'
+updated: March 23, 2021 at 2:54:52 PM EDT
 ---
 
-Paragraph One: Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
-
-### Heading Level Three
-
-Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat
-
+Open Source commercial applicationreal-time collaboration. DevOps teams use Mattermost to increase efficiency during critical moments—resolving incidents, provisioning infrastructure, merging code branches, or addressing urgent bugs. Mattermost unifies people, tools, systems data, and automation.
\ No newline at end of file
diff --git a/src/content/service-detail/misty-sierra.md b/src/content/service-detail/misty-sierra.md
index 5633935c2a54b5f9fdd3eb69362082cfd2a6e1e6..13b77ceff23e4409484c9e5fda1797638b187a49 100644
--- a/src/content/service-detail/misty-sierra.md
+++ b/src/content/service-detail/misty-sierra.md
@@ -1,12 +1,47 @@
 ---
 slug: '/services/misty-sierra'
 title: 'Misty Sierra'
-categories: ['Networking & Connectivity', 'Global Networking / WAN']
-levels: ['SEC-COLL']
+categories: 
+  - Networking & Connectivity
+  - Global Connectivity / WAN
+levels: 
+  - S-SAR
+  - TS-SAR
+  - TS-SCI
+excerpt: 'Misty Sierra is a compartmented WAN that includes trusted MLS services, specifically providing an integrated PL-4 desktop environment with Automated Information System tools and functions.'
+updated: March 23, 2021 at 2:54:52 PM EDT
 ---
 
-Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
+### Benefits & Features
 
-## Heading Level Two
+- PMO managed ATO; minimal burden to site cybersecurity
+- Can be installed at contractor sites
+- ID Access Management automatically updated by JADE
+- Allows connections to existing PL-2, PL-3 and PL-4 systems via Trusted Gateways, High Assurance Controlled Interfaces and Trusted Domain Interfaces
+- Support to Windows Single Level LANs
+- Transport via JWICs, NIPR, SIPR or Commercial (transport agnostic)
+- Managed to the desktop by the Enterprise Management Center (EMC)
 
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
\ No newline at end of file
+### Requirements
+
+ATC is required to connect an existing network to Misty Sierra and must be signed off by AO (SAF/AAZ).
+
+Required Documentation
+- AF Form 1067
+- ISS Site Survey/Requirement Checklist
+- ISS Program ID (PID) Checklist
+- SCIF/SAPF accreditation document
+- LAN ATO (if applicable)
+
+### Supported Capabilities
+
+- Computing devices
+- Voice/VoIP
+- Printing
+- Scanning
+- DVD burning
+- Javelin
+- [Rock](/services/core-rock)
+- Braces
+- Hawkeye
+- [FENCES](/services/fences)
\ No newline at end of file
diff --git a/src/content/service-detail/ms-365.md b/src/content/service-detail/ms-365.md
deleted file mode 100644
index 4e8513ed3f5840df8813731b4b5fb0e48378396d..0000000000000000000000000000000000000000
--- a/src/content/service-detail/ms-365.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-slug: '/services/microsoft-office-365'
-title: 'Microsoft Office 365'
-categories: ['Productivity & Collaboration']
-levels: ['SEC-COLL']
----
-
-Paragraph One: Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
-
-### Heading Level Three
-
-Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat
-
diff --git a/src/content/service-detail/platform-one-cnap.md b/src/content/service-detail/platform-one-cnap.md
new file mode 100644
index 0000000000000000000000000000000000000000..e8aabbf240038d7a18a5692d714b6c61eb6cae34
--- /dev/null
+++ b/src/content/service-detail/platform-one-cnap.md
@@ -0,0 +1,24 @@
+---
+slug: '/services/platform-one-cnap'
+title: 'Platform One Cloud Native Access Portal (CNAP)'
+shortTitle: 'CNAP'
+categories: 
+  - Networking & Connectivity
+  - Cloud Access
+levels: 
+  - U
+excerpt: 'CNAP provides access to cloud-based development, testing, and production enclaves.'
+updated: March 23, 2021 at 2:54:52 PM EDT
+---
+
+### Benefits & Features
+
+- Brings a full Zero Trust tech stack enforcing device state, user RBAC, and Software Defined Perimeter / Networks based on Google BeyondCorp concepts
+- Allows access to Cloud One (AWS GovCloud and soon Azure Government) and Platform One without a BCAP or IAP
+- Allows thick client access from BYOD Government-owned devices (both mobile and desktop) through AppGate Zero Trust clients to enforce device states
+- Allows for VDI options for zero / thin clients
+- Enables internet egress at IL 5 in development enclaves
+- Brings DMZ Network / Perimeter stack with break and inspect, IDS / IPS , WAF Capability, full packet captures as an elastic Cloud-based stack
+- Brings SSO with various DoD PKI authentication options and IL2 MFA options.
+- Centralizes and aggregates logs and pushes to CSSP
+
diff --git a/src/content/service-detail/platform-one.md b/src/content/service-detail/platform-one.md
index 97501e8a0fa96c3e34480bf848d0855328fddf84..fd2d5bdce746b072b9d98faa4fbe840122c0c859 100644
--- a/src/content/service-detail/platform-one.md
+++ b/src/content/service-detail/platform-one.md
@@ -1,12 +1,13 @@
 ---
 slug: '/services/platform-one'
 title: 'Platform One'
-categories: ['DevSecOps']
-levels: ['SEC-COLL']
+categories: 
+  - Software Development & DevSecOps
+levels: 
+  - U
+  - S
+excerpt: 'Platform One provides the secure DevSecOps platform and pipelines needed to implement and automate the accreditation and deployment of warfighting software capabilities at commercial speeds.'
+updated: March 23, 2021 at 2:54:52 PM EDT
 ---
 
-Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
\ No newline at end of file
+Platform One implements the DoD DevSecOps transformation with program offices under the technical direction and vision of the Air Force Chief Software Officer. Platform One is also the DoD CIO’s preferred DevSecOps service provider.
diff --git a/src/content/service-detail/rock.md b/src/content/service-detail/rock.md
deleted file mode 100644
index 4ea49fbbd6eef9d0613655e6886b1c5bdeb929d8..0000000000000000000000000000000000000000
--- a/src/content/service-detail/rock.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-slug: '/services/rock'
-title: 'Rock'
-subtitle: 'Incident management / ticketing'
-categories: ['Productivity & Collaboration']
-levels: ['SEC-COLL']
----
-
-Paragraph One: Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
-
-### Heading Level Three
-
-Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat
-
diff --git a/src/content/service-detail/sap-voice.md b/src/content/service-detail/sap-voice.md
new file mode 100644
index 0000000000000000000000000000000000000000..e478d7e703295b33736b407fe15ea5f5da278d93
--- /dev/null
+++ b/src/content/service-detail/sap-voice.md
@@ -0,0 +1,15 @@
+---
+slug: '/services/sap-voice'
+title: 'SAP Voice'
+categories: 
+  - Communications
+levels: 
+  - S-SAR
+  - TS-SAR
+  - TS-SCI
+excerpt: 'Voice-over-internet-protocol (VoIP) capabilities on SAP networks.'
+updated: March 23, 2021 at 2:54:52 PM EDT
+---
+
+VoIP is currently available via disparately fielded systems like Misty Sierra, Starburst and Summit. 
+
diff --git a/src/content/service-detail/sap-voip.md b/src/content/service-detail/sap-voip.md
deleted file mode 100644
index 6964731c4ace420e0b7b188ac537f4331636e4ed..0000000000000000000000000000000000000000
--- a/src/content/service-detail/sap-voip.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-slug: '/services/sap-voip'
-title: 'Special Access Program (SAP) VoIP'
-categories: ['Networking & Connectivity', 'Voice / VoIP']
-levels: ['SEC-COLL']
----
-
-Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
diff --git a/src/content/service-detail/seitaas-isp.md b/src/content/service-detail/seitaas-isp.md
new file mode 100644
index 0000000000000000000000000000000000000000..1efcb46cd9cf94e36e8d570235a9119b685d123e
--- /dev/null
+++ b/src/content/service-detail/seitaas-isp.md
@@ -0,0 +1,12 @@
+---
+slug: '/services/seitaas-isp'
+title: 'SEITaaS Procured Internet Service Provider (ISP)'
+shortTitle: 'SEITaaS ISP'
+categories: 
+  - Networking & Connectivity
+  - Global Connectivity / WAN
+excerpt: 'SEITaaS network transport will be provided by a catalogue of service providers including both government and commercial internet providers.'
+updated: March 23, 2021 at 2:54:52 PM EDT
+---
+
+During site surveys and end user requirements refinement the SEITaaS/Summit team will evaluate all available options for connectivity at a site and use the best available option to meet the user requirements.
diff --git a/src/content/service-detail/seitaas-remote-connect.md b/src/content/service-detail/seitaas-remote-connect.md
new file mode 100644
index 0000000000000000000000000000000000000000..c0f9b977d28e6401c0cc575a58e09298f7af8f44
--- /dev/null
+++ b/src/content/service-detail/seitaas-remote-connect.md
@@ -0,0 +1,15 @@
+---
+slug: '/services/seitaas-remote-connect'
+title: 'SEITaaS Remote Connect'
+categories: 
+  - Networking & Connectivity
+  - Virtual Private Connections
+levels: 
+  - S-SAR
+  - S-SCI
+  - TS-SAR
+  - TS-SCI
+excerpt: 'SEITaaS will enable enterprise capabilities to be provided as a service to users accessing thin client, zero client, or connected self sustained performer LANs.'
+updated: March 23, 2021 at 2:54:52 PM EDT
+---
+
diff --git a/src/content/service-detail/seitaas-summit.md b/src/content/service-detail/seitaas-summit.md
new file mode 100644
index 0000000000000000000000000000000000000000..c741414c31b53fe50782bf76dc3129c64142d2ef
--- /dev/null
+++ b/src/content/service-detail/seitaas-summit.md
@@ -0,0 +1,15 @@
+---
+slug: '/services/seitaas-summit'
+title: 'SEITaaS Summit'
+categories: 
+  - Networking & Connectivity
+  - Global Connectivity / WAN
+levels: 
+  - S-SAR
+  - TS-SAR
+  - TS-SCI
+excerpt: 'Summit is an SAP network providing consolidated, multi-level security (MLS) capabilities via a network-as-a-service (NaaS) model.'
+updated: March 23, 2021 at 2:51:35 PM EDT
+---
+
+SEITaaS/Summit delivers End User Services, MLS applications, and NaaS to include data transport and endpoints.  These capabilities are maintained centrally and down to the desktop.  Users have the ability to select applications and new capabilities from a government service catalog or request new services to add to the government service catalog as needed.
diff --git a/src/content/service-detail/seitaas.md b/src/content/service-detail/seitaas.md
deleted file mode 100644
index b4ea2bc2ac336ccbc999a7a3e3005beb8897a945..0000000000000000000000000000000000000000
--- a/src/content/service-detail/seitaas.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-slug: '/services/seitaas'
-title: 'SEITaaS'
-categories: ['Networking & Connectivity', 'Local Networking / BAN']
-levels: ['SEC-COLL']
----
-
-Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
diff --git a/src/content/service-detail/starbust.md b/src/content/service-detail/starbust.md
index 532d8b41db2d89491a1f22ae0a9c6e33f8077d43..de2ced69688e904be0c74a274a0b0f257712a372 100644
--- a/src/content/service-detail/starbust.md
+++ b/src/content/service-detail/starbust.md
@@ -1,12 +1,39 @@
 ---
 slug: '/services/starburst'
 title: 'Starburst'
-categories: ['Networking & Connectivity', 'Global Networking / WAN']
-levels: ['SEC-COLL']
+categories: 
+  - Networking & Connectivity
+  - Global Connectivity / WAN
+levels:
+  - TS-SCI
+excerpt: 'Starburst allows sites to communicate by using VoIP phones, email, file sharing, and other capabilities.'
+updated: March 23, 2021 at 2:54:52 PM EDT
 ---
 
-Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
+Starburst is an Air Force Special Access Program (SAP) network approved for TS//SCI processing. DoD, AF, and industry facilities can utilize the optional Starburst Remote Client (SRC) console to access Starburst. SRC is a fully accredited and deployable Starburst network node. A separately accredited information system may be used to connect to Starburst, if required.
 
-## Heading Level Two
+### Benefits & Features
+
+- Provides access to Starburst capabilities and services to sites where a high degree of operational readiness is not required.
+- Supports access to remote sites and users with different formal access approvals.
+- Increases the ability to communicate SAP and SCI level information with AF, DoD, and Industry partners.
+- Reduces risk of classified information mishandling.
+- Consolidates disparate network architectures.
+- Reduces or eliminates the need to courier or fax classified information.
+- Reduces time and resource costs of building, deploying, and accrediting classified information system.
+- Communication and data transfers between AF, DoD, and Industry partners.
+- SAP TS/SCI level information sharing
+- Multi-level and compartmented communications
+
+### Requirements
+
+- Approved Secure Facility
+- Approved 1067 or IT Network Request
+- Completed Requirements Questionnaire
+
+### Supported Capabilities
+
+- Email and file sharing functionality via Rock and SIC services
+- Voice/VoIP
+- Access to JADE personnel adjudication database
 
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
diff --git a/src/content/service-detail/summit.md b/src/content/service-detail/summit.md
deleted file mode 100644
index 441f9177fca2db3d561a0ca7675b474026d0f526..0000000000000000000000000000000000000000
--- a/src/content/service-detail/summit.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-slug: '/services/summit'
-title: 'Summit'
-categories: ['Networking & Connectivity', 'Global Networking / WAN']
-levels: ['SEC-COLL']
----
-
-Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
diff --git a/src/content/service-detail/tdc.md b/src/content/service-detail/tdc.md
deleted file mode 100644
index 07f634fce6f823674daa6dcdd578562ed550676e..0000000000000000000000000000000000000000
--- a/src/content/service-detail/tdc.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-slug: '/services/tdc'
-title: 'Theater Deployable Comms (TDC)'
-categories: ['Networking & Connectivity', 'Global Networking / WAN']
-levels: ['SEC-COLL']
----
-
-Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
diff --git a/src/content/service-detail/theater-deployable-comms.md b/src/content/service-detail/theater-deployable-comms.md
new file mode 100644
index 0000000000000000000000000000000000000000..4dcab75f17cfada8efd5dc3d3c723edc33a90b8e
--- /dev/null
+++ b/src/content/service-detail/theater-deployable-comms.md
@@ -0,0 +1,16 @@
+---
+slug: '/services/theater-deployable-comms'
+title: 'Theater Deployable Comms (TDC)'
+shortTitle: 'TDC'
+categories: 
+  - Networking & Connectivity
+  - Global Connectivity / WAN
+  - Compute & Store
+levels: 
+  - U
+  - S
+excerpt: 'TDC is a communications infrastructure designed to transmit and receive voice, data and video securely from wired, wireless and satellite sources (intra and inter-theater).'
+updated: March 23, 2021 at 2:52:07 PM EDT
+--- 
+
+TDC provides communication services ISO Contingency Response Forces (CRF), Theater Air Control System (TACS), AEW/AEG, C/JFACC and Special Operations Units.
diff --git a/src/content/service-detail/victory.md b/src/content/service-detail/victory.md
index 170a0570eed88be8b42dca50309ad26da5e9f2cb..2baf9293b2a8e40c304848e659dff90f65a1652b 100644
--- a/src/content/service-detail/victory.md
+++ b/src/content/service-detail/victory.md
@@ -1,12 +1,14 @@
 ---
 slug: '/services/victory'
 title: 'Victory'
-categories: ['Networking & Connectivity', 'Global Networking / WAN']
-levels: ['SEC-COLL']
+categories:
+  - Networking & Connectivity
+  - Global Connectivity / WAN
+levels:
+  - S-SAR
+  - TS-SCI
+excerpt: 'Victory is a Special Access Program (SAP),  Microsoft Windows based, Wide Area Network hosted at Protection Level 3 (PL-3).'
+updated: March 23, 2021 at 2:54:52 PM EDT
 ---
 
-Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? 
-
-## Heading Level Two
-
-At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.
+There are two distinct and separate systems with one at the S//SAR and the other at the TS//SAR//SCI level.  The system is managed by the MSC and all hardware (desktop, switches, routers, servers, etc) are under a strict configuration management policy centrally implemented and enforced.
diff --git a/src/content/solutions/biti.md b/src/content/solutions/biti.md
new file mode 100644
index 0000000000000000000000000000000000000000..d278c722a0041dd6fc350824e81c6cf341305a1d
--- /dev/null
+++ b/src/content/solutions/biti.md
@@ -0,0 +1,14 @@
+---
+slug: '/solutions/biti'
+title: BITI modernization
+useCase: Optimize and modernize networks and connectivity across a base
+categories:
+  - Networking & Connectivity
+shoppable:
+  - Base IT Infrastructure
+  - AFSEN COIN
+nonShoppable:
+  - Dual-Path Resiliency
+  - HN Performance & Integration Team
+index: 2
+---
\ No newline at end of file
diff --git a/src/content/solutions/digital-trinity.md b/src/content/solutions/digital-trinity.md
new file mode 100644
index 0000000000000000000000000000000000000000..00a277a301b80fedd92a800195201538a355486f
--- /dev/null
+++ b/src/content/solutions/digital-trinity.md
@@ -0,0 +1,15 @@
+---
+slug: '/solutions/digitial-trinity'
+title: Digital Trinity
+useCase: Build software that spans multiple security levels
+categories:
+  - Compute & Store
+  - Software Development & DevSecOps
+  - Digital Engineering
+shoppable:
+  - DE Platform
+  - Platform One
+  - Cloud One
+  - FENCES
+index: 0
+---
\ No newline at end of file
diff --git a/src/content/solutions/seitaas.md b/src/content/solutions/seitaas.md
new file mode 100644
index 0000000000000000000000000000000000000000..c6bd302921fc3e5e02fbc7521d3f74fde34c9ce7
--- /dev/null
+++ b/src/content/solutions/seitaas.md
@@ -0,0 +1,15 @@
+---
+slug: '/solutions/seitaas'
+title: SEITaaS
+useCase: Stand up PL-4 data transport, endpoints, and enterprise software for SAP workloads
+categories:
+  - Networking & Connectivity
+  - Communications
+shoppable:
+  - SEITaaS Summit
+  - SEITaaS ISP
+  - SAP Voice
+  - AF7
+  - SEITaaS Remote Connect
+index: 1
+---
\ No newline at end of file
diff --git a/src/images/c-one-hero.png b/src/images/c-one-hero.png
deleted file mode 100644
index 75eada5a4deb093f2bdf7af9908379ea63a442af..0000000000000000000000000000000000000000
Binary files a/src/images/c-one-hero.png and /dev/null differ
diff --git a/src/images/cat-header-comp-store.png b/src/images/cat-header-comp-store.png
new file mode 100644
index 0000000000000000000000000000000000000000..b94a8f51e757c6d6076e1ed44c9d58bac3688e02
Binary files /dev/null and b/src/images/cat-header-comp-store.png differ
diff --git a/src/images/clouds-19.jpg b/src/images/clouds-19.jpg
deleted file mode 100644
index 185d84a1fbbc1de781d642a546366ffdc1045df9..0000000000000000000000000000000000000000
Binary files a/src/images/clouds-19.jpg and /dev/null differ
diff --git a/src/images/detail-header.png b/src/images/detail-header.png
new file mode 100644
index 0000000000000000000000000000000000000000..65e3798abd8a9fb5478adbe1842e2ace57512534
Binary files /dev/null and b/src/images/detail-header.png differ
diff --git a/src/images/noun_Network_1571001.svg b/src/images/noun_Network_1571001.svg
deleted file mode 100644
index 6eb688808d10ab25b809aacd05c89441976abea9..0000000000000000000000000000000000000000
--- a/src/images/noun_Network_1571001.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height='100px' width='100px'  fill="#000000" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" x="0px" y="0px" viewBox="0 0 100 100"><g transform="translate(0,-952.36218)"><path style="text-indent:0;text-transform:none;direction:ltr;block-progression:tb;baseline-shift:baseline;color:#000000;enable-background:accumulate;" d="m 50,961.36217 c -5.2846,0 -9.6362,4.1706 -9.9688,9.375 C 24.4383,975.09597 13,989.40507 13,1006.3622 c 0,3.3929 0.4555,6.6674 1.3125,9.7812 -2.6089,1.8096 -4.3125,4.8222 -4.3125,8.2188 0,5.4991 4.5008,10 10,10 1.6586,0 3.2129,-0.4022 4.5938,-1.125 6.625,6.2637 15.5768,10.125 25.4062,10.125 9.8294,0 18.7812,-3.8614 25.4062,-10.125 1.3809,0.7228 2.9352,1.125 4.5938,1.125 5.4992,0 10,-4.5009 10,-10 0,-3.3966 -1.7036,-6.4092 -4.3125,-8.2188 0.857,-3.1139 1.3125,-6.3883 1.3125,-9.7812 0,-16.95713 -11.4383,-31.26623 -27.0312,-35.62503 -0.3326,-5.2044 -4.6842,-9.375 -9.9688,-9.375 z m 0,4 c 3.3374,0 6,2.6627 6,6 0,3.3373 -2.6626,6 -6,6 -3.3374,0 -6,-2.6627 -6,-6 0,-3.3373 2.6626,-6 6,-6 z m -9.4062,9.375 c 1.391,3.8547 5.0879,6.625 9.4062,6.625 4.3183,0 8.0152,-2.7703 9.4062,-6.625 13.6361,4.0483 23.5938,16.6486 23.5938,31.62503 0,2.8418 -0.3831,5.5923 -1.0625,8.2188 -0.6303,-0.1258 -1.2717,-0.2188 -1.9375,-0.2188 -5.4992,0 -10,4.5009 -10,10 0,2.3903 0.8369,4.6183 2.25,6.3438 -5.8688,5.3751 -13.6586,8.6562 -22.25,8.6562 -8.5914,0 -16.3812,-3.2811 -22.25,-8.6562 1.4131,-1.7255 2.25,-3.9535 2.25,-6.3438 0,-5.4991 -4.5008,-10 -10,-10 -0.6658,0 -1.3072,0.093 -1.9375,0.2188 C 17.3831,1011.9545 17,1009.204 17,1006.3622 17,991.38577 26.9577,978.78547 40.5938,974.73717 z M 20,1018.3622 c 3.3374,0 6,2.6627 6,6 0,3.3373 -2.6626,6 -6,6 -3.3374,0 -6,-2.6627 -6,-6 0,-3.3373 2.6626,-6 6,-6 z m 60,0 c 3.3374,0 6,2.6627 6,6 0,3.3373 -2.6626,6 -6,6 -3.3374,0 -6,-2.6627 -6,-6 0,-3.3373 2.6626,-6 6,-6 z" fill="#000000" fill-opacity="1" stroke="none" marker="none" visibility="visible" display="inline" overflow="visible"></path></g></svg>
\ No newline at end of file
diff --git a/src/pages/index.js b/src/pages/index.js
index 75e3a7584c83b6ad7d070886b22dee500a07185e..582ab1e716998791b69fcb4bbd67b2b86df57ee4 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -1,13 +1,13 @@
 import React from 'react';
-import { Box, Heading, Paragraph } from 'grommet';
+import { Box, Heading } from 'grommet';
 import { AppLayout, SEO } from '../components/app';
 import { Container, Column } from '../components/layout';
 import { Hero } from '../components/hero';
-import { Solutions, OfferAccordion } from '../components/pages/home';
+import { Solutions, OfferAccordion, Steps } from '../components/pages/home';
 
 const IndexPage = () => (
-  <AppLayout isHome>
-    <SEO title="AF Enterprise Digital Transformation Services" />
+  <AppLayout transparentHeader>
+    <SEO />
     <Hero />
     <Container>
       <Column>
@@ -15,21 +15,9 @@ const IndexPage = () => (
           <Heading level={1} as="h2">
             Here′s How It Works
           </Heading>
+          <Steps />
           <OfferAccordion />
         </Box>
-        <Box align="center">
-          <Heading
-            level={1}
-            as="h2"
-            textAlign="center"
-            margin={{ bottom: 'medium' }}
-          >
-            Got Needs That Go Beyond <br /> A Single Service?
-          </Heading>
-          <Paragraph textAlign="center" style={{ letterSpacing: '0.05em' }}>
-            Our solutions include combinations of services to meet common uses.
-          </Paragraph>
-        </Box>
         <Solutions />
       </Column>
     </Container>
diff --git a/src/pages/other-programs.js b/src/pages/other-programs.js
new file mode 100644
index 0000000000000000000000000000000000000000..64b8a58e7f1d69bf5f451ff5a107203840f626af
--- /dev/null
+++ b/src/pages/other-programs.js
@@ -0,0 +1,118 @@
+import React from 'react';
+import { graphql } from 'gatsby';
+import { Box, Tabs, Tab, ThemeContext } from 'grommet';
+import { AppLayout, SEO } from '../components/app';
+import { Container, Column } from '../components/layout';
+import { ServiceHero } from '../components/hero';
+import { Markdown } from '../components/core';
+
+const OtherPrograms = ({ data }) => {
+  const imageFluid = data.allFile.edges[0].node.childImageSharp.fluid;
+  const tabPages = data.allMarkdownRemark.edges;
+
+  const tabTheme = {
+    tabs: {
+      gap: 'none',
+      pad: {
+        bottom: 'none',
+      },
+      header: {},
+    },
+    tab: {
+      active: {
+        background: 'brand',
+        color: 'white',
+      },
+      color: 'black',
+      border: {
+        color: 'light-1',
+        size: 'small',
+        active: {
+          color: {
+            light: 'brand',
+          },
+        },
+        hover: {
+          color: {
+            light: 'brand',
+          },
+        },
+      },
+      pad: { horizontal: 'medium' },
+      extend: () => ({ fontWeight: 'bold', margin: 0 }),
+    },
+    text: {
+      font: {
+        weight: 'bold',
+      },
+      xsmall: { size: '14px' },
+      small: { size: '14px' },
+      medium: { size: '14px' },
+      large: { size: '14px' },
+      xlarge: { size: '14px' },
+    },
+  };
+
+  return (
+    <AppLayout transparentHeader>
+      <SEO
+        title="Our Other Programs"
+        description="C3I&N's portfolio includes many different IT programs, such as EITaaS, CHES, ICAM and more. View all our programs."
+      />
+      <ServiceHero
+        title="Our Other Programs"
+        subtitle="Lorem Ipsum"
+        imageFluid={imageFluid}
+      />
+      <Container>
+        <Column>
+          <Box pad={{ vertical: 'large' }}>
+            <ThemeContext.Extend value={tabTheme}>
+              <Tabs justify="start">
+                {tabPages.map(({ node }) => (
+                  <Tab
+                    key={node.frontmatter.name}
+                    title={node.frontmatter.name}
+                  >
+                    <Markdown>{node.rawMarkdownBody}</Markdown>
+                  </Tab>
+                ))}
+              </Tabs>
+            </ThemeContext.Extend>
+          </Box>
+        </Column>
+      </Container>
+    </AppLayout>
+  );
+};
+
+export const pageQuery = graphql`
+  query OtherProgramQuery {
+    allMarkdownRemark(
+      filter: { fileAbsolutePath: { regex: "/content/other-programs/" } }
+      sort: { order: ASC, fields: frontmatter___index }
+    ) {
+      edges {
+        node {
+          frontmatter {
+            name
+          }
+          rawMarkdownBody
+        }
+      }
+    }
+    allFile(filter: { absolutePath: { regex: "/images/detail-header.png/" } }) {
+      edges {
+        node {
+          childImageSharp {
+            fluid {
+              ...GatsbyImageSharpFluid
+            }
+          }
+        }
+      }
+    }
+  }
+`;
+
+export default OtherPrograms;
diff --git a/src/pages/solutions.js b/src/pages/solutions.js
new file mode 100644
index 0000000000000000000000000000000000000000..781226d7b0b33869680f549a4308c23af40b4d71
--- /dev/null
+++ b/src/pages/solutions.js
@@ -0,0 +1,113 @@
+import React from 'react';
+import { graphql } from 'gatsby';
+import { Box, Heading, Text, Button, ResponsiveContext } from 'grommet';
+import { AppLayout, SEO } from '../components/app';
+import { Container, Column } from '../components/layout';
+import { ServiceHero } from '../components/hero';
+import { DtSquare } from '../components/icons';
+import { Link } from '../components/core';
+
+const Solutions = ({ data }) => {
+  const imageFluid = data.allFile.edges[0].node.childImageSharp.fluid;
+  const solutionPages = data.allMarkdownRemark.edges;
+
+  return (
+    <AppLayout transparentHeader>
+      <SEO
+        title="Solutions"
+        description="C3I&N's IT solutions offer combinations of core digital transformation services to solve for complex requirements."
+      />
+      <ServiceHero
+        title="Solutions"
+        subtitle="C3I&N's IT solutions offer combinations of our core digital transformation services to solve for complex requirements."
+        imageFluid={imageFluid}
+      />
+      <ResponsiveContext.Consumer>
+        {(size) => (
+          <Container>
+            <Column>
+              <Box pad={{ vertical: 'large' }}>
+                {solutionPages.map(({ node }) => (
+                  <Box
+                    key={node.frontmatter.title}
+                    pad={{ vertical: 'medium' }}
+                  >
+                    <Box direction="row" align="start" gap="small">
+                      <Box margin={{ vertical: '20px' }}>
+                        <DtSquare color="black" size="small" />
+                      </Box>
+
+                      <Heading level={3} margin={{ vertical: 'small' }}>
+                        {node.frontmatter.useCase}
+                      </Heading>
+                    </Box>
+
+                    <Box
+                      height="100px"
+                      justify="between"
+                      pad={{ horizontal: 'medium' }}
+                    >
+                      {!['xsmall', 'small'].includes(size) && (
+                        <Box direction="row" gap="small">
+                          {node.frontmatter.categories.map((item) => (
+                            <Text key={item} size="small" color="dark-1">
+                              {item}
+                            </Text>
+                          ))}
+                        </Box>
+                      )}
+
+                      <Link to={node.frontmatter.slug}>View Details</Link>
+                    </Box>
+                  </Box>
+                ))}
+
+                <Box direction="row" gap="medium" pad="medium" width="large">
+                  <Box background="brand" width="15px"></Box>
+                  <Box gap="small">
+                    <Text weight="bold">Got a different need?</Text>
+                    <Button label="LET US KNOW"></Button>
+                  </Box>
+                </Box>
+              </Box>
+            </Column>
+          </Container>
+        )}
+      </ResponsiveContext.Consumer>
+    </AppLayout>
+  );
+};
+
+export const pageQuery = graphql`
+  query SolutionsQuery {
+    allMarkdownRemark(
+      filter: { fileAbsolutePath: { regex: "/content/solutions/" } }
+      sort: { order: ASC, fields: frontmatter___index }
+    ) {
+      edges {
+        node {
+          frontmatter {
+            title
+            useCase
+            slug
+            categories
+            shoppable
+          }
+        }
+      }
+    }
+    allFile(filter: { absolutePath: { regex: "/images/detail-header.png/" } }) {
+      edges {
+        node {
+          childImageSharp {
+            fluid {
+              ...GatsbyImageSharpFluid
+            }
+          }
+        }
+      }
+    }
+  }
+`;
+
+export default Solutions;
diff --git a/src/styles/global.css b/src/styles/global.css
index a4d3bfe06204921a0774229114e2e88b9ef0e01d..e98cc642d5b4cc70dfa666301938ab3a17add403 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -2,5 +2,5 @@ body {
   margin: 0;
   /* Hack for megamenu modal mode */
   /* TODO: Find a better way */
-  overflow: auto !important;
+  /* overflow: auto !important; */
 }
diff --git a/src/styles/theme.js b/src/styles/theme.js
index c527564d66a0359be40155d52ef186f8e10a327a..bebd10b4caa1a76c4254cf1c1c5e805da47446fe 100644
--- a/src/styles/theme.js
+++ b/src/styles/theme.js
@@ -50,7 +50,7 @@ const globalBreakpoints = {
     },
   },
   large: {
-    value: 1540, // 1180,
+    value: 1440, // 1180,
     edgeSize: {
       none: '0px',
       small: '12px',
@@ -86,6 +86,7 @@ export const themeOverrides = {
       'accent-2': '#00c9f8',
       'accent-3': '#061331',
       'dark-1': '#666666',
+      'dark-4': '#1a1a1a',
       'light-1': '#CCCCCC',
       text: {
         dark: '#fff',
diff --git a/src/templates/Generic.js b/src/templates/Generic.js
index 1b3ad09f494d8fc8fc5ffb574cdd0bde18ab749d..cf1e0e00f9ae0125c1f40733a9c1291c4d01e8e3 100644
--- a/src/templates/Generic.js
+++ b/src/templates/Generic.js
@@ -14,13 +14,17 @@ import { Markdown } from '../components/core';
  */
 const GenericTemplate = ({ data }) => {
   const {
-    frontmatter: { title },
+    frontmatter: { title, subtitle, description, image },
     rawMarkdownBody,
   } = data.markdownRemark;
   return (
-    <AppLayout>
-      <SEO title={title} />
-      <ServiceHero title={title} />
+    <AppLayout transparentHeader>
+      <SEO title={title} description={description} />
+      <ServiceHero
+        title={title}
+        subtitle={subtitle}
+        imageFluid={image.childImageSharp.fluid}
+      />
       <Container>
         <Column>
           <Markdown>{rawMarkdownBody}</Markdown>
@@ -37,6 +41,15 @@ export const pageQuery = graphql`
       frontmatter {
         slug
         title
+        subtitle
+        description
+        image {
+          childImageSharp {
+            fluid {
+              ...GatsbyImageSharpFluid
+            }
+          }
+        }
       }
     }
   }
diff --git a/src/templates/ServiceCategory.js b/src/templates/ServiceCategory.js
index 80375508ce2658f8b013f2c987453eba8f2ea7cb..48f5ba906402c06cd4a7e287372ecedc3bcc93c2 100644
--- a/src/templates/ServiceCategory.js
+++ b/src/templates/ServiceCategory.js
@@ -13,17 +13,22 @@ import { ServiceList } from '../components/pages/service-category';
  */
 const ServiceCategoryTemplate = ({ data }) => {
   const {
-    frontmatter: { title, categories, image },
+    frontmatter: { title, categories, image, icon },
     rawMarkdownBody,
   } = data.markdownRemark;
 
   return (
     <AppLayout>
-      <SEO title={title} />
+      <SEO
+        title={title}
+        description={`${title} services available from C3I&N to support digital transformation across the U.S. Air Force.`}
+        image={image.childImageSharp.fixed.src}
+      />
       <ServiceCatHero
         title={title}
         description={rawMarkdownBody}
         imageFluid={image.childImageSharp.fluid}
+        iconName={icon}
       />
       <ServiceList categories={categories} />
     </AppLayout>
@@ -45,11 +50,15 @@ export const pageQuery = graphql`
         slug
         title
         categories
+        icon
         image {
           childImageSharp {
             fluid {
               ...GatsbyImageSharpFluid
             }
+            fixed(width: 1200, height: 630) {
+              ...GatsbyImageSharpFixed
+            }
           }
         }
       }
diff --git a/src/templates/ServiceDetail.js b/src/templates/ServiceDetail.js
index c1ed9b1ec942627e996271a358803c299392f87a..ae9c746bd034c3d5791c5b70174162d1a949d17c 100644
--- a/src/templates/ServiceDetail.js
+++ b/src/templates/ServiceDetail.js
@@ -17,12 +17,18 @@ import ContactForm from '../components/ContactForm';
  */
 const ServiceDetailTemplate = ({ data }) => {
   const { frontmatter, rawMarkdownBody } = data.markdownRemark;
+  const images = data.allFile.edges;
+
   return (
-    <AppLayout>
-      <SEO title={frontmatter.title} />
+    <AppLayout transparentHeader>
+      <SEO
+        title={frontmatter.title}
+        description={`Learn about ${frontmatter.title} from C3I&N. ${frontmatter.excerpt}`}
+      />
       <ServiceHero
         title={frontmatter.title}
         categories={frontmatter.categories}
+        imageFluid={images[0].node.childImageSharp.fluid}
       />
       <Container>
         <Column>
@@ -53,6 +59,17 @@ export const pageQuery = graphql`
         levels
       }
     }
+    allFile(filter: { absolutePath: { regex: "/images/detail-header.png/" } }) {
+      edges {
+        node {
+          childImageSharp {
+            fluid {
+              ...GatsbyImageSharpFluid
+            }
+          }
+        }
+      }
+    }
   }
 `;
 
diff --git a/src/templates/SolutionDetail.js b/src/templates/SolutionDetail.js
new file mode 100644
index 0000000000000000000000000000000000000000..6da179f9eec0f1feeac16a63acc18505e7aef9c8
--- /dev/null
+++ b/src/templates/SolutionDetail.js
@@ -0,0 +1,84 @@
+import React from 'react';
+import { graphql } from 'gatsby';
+import { Box, Text } from 'grommet';
+import { AppLayout, SEO } from '../components/app';
+import { Container, Column } from '../components/layout';
+import { ServiceHero } from '../components/hero';
+import ContactForm from '../components/ContactForm';
+import { SolutionList } from '../components/pages/solution-detail';
+
+/**
+ * Template file for Solution Detail Markdown pages.
+ * Data sourced from `/src/content/solutions
+ * @param {object} props - React props
+ * @param {object} props.data - Page data from GraphQL query. See `pageQuery` for properties
+ * @returns
+ */
+const SolutionDetailTemplate = ({ data }) => {
+  const { frontmatter } = data.markdownRemark;
+  const images = data.allFile.edges;
+
+  return (
+    <AppLayout transparentHeader>
+      <SEO
+        title={`${frontmatter.title} Solution Package`}
+        description={`${frontmatter.useCase} with C3I&N's core digital transformation services.`}
+      />
+      <ServiceHero
+        pretitle="SOLUTION PACKAGE"
+        title={frontmatter.title}
+        subtitle={frontmatter.useCase}
+        imageFluid={images[0].node.childImageSharp.fluid}
+      />
+      <Container>
+        <Column>
+          <Box pad={{ vertical: 'large' }} direction="row" gap="xlarge">
+            <Box>
+              <Box direction="row" gap="small" pad="medium" width="large">
+                <Box background="brand" width="15px"></Box>
+                <Box>
+                  <Text weight="bold">{`The following C3I&N services could be used together to help ${frontmatter.useCase}`}</Text>
+                </Box>
+              </Box>
+              <SolutionList
+                shoppable={frontmatter.shoppable}
+                nonShoppable={frontmatter.nonShoppable}
+              />
+            </Box>
+            <Box basis="460px" flex={{ shrink: 0 }}>
+              <ContactForm />
+            </Box>
+          </Box>
+        </Column>
+      </Container>
+    </AppLayout>
+  );
+};
+
+export const pageQuery = graphql`
+  query($slug: String!) {
+    markdownRemark(frontmatter: { slug: { eq: $slug } }) {
+      rawMarkdownBody
+      frontmatter {
+        slug
+        title
+        useCase
+        shoppable
+        nonShoppable
+      }
+    }
+    allFile(filter: { absolutePath: { regex: "/images/detail-header.png/" } }) {
+      edges {
+        node {
+          childImageSharp {
+            fluid {
+              ...GatsbyImageSharpFluid
+            }
+          }
+        }
+      }
+    }
+  }
+`;
+
+export default SolutionDetailTemplate;