diff --git a/src/02_starter/App.js b/src/02_starter/App.js
index 0196597..b652187 100644
--- a/src/02_starter/App.js
+++ b/src/02_starter/App.js
@@ -1,12 +1,18 @@
 import React from 'react'
 import Layout from './Layout'
-import imgSources from './data'
+import urls from './data'
+import Switch from './Switch'
+import { Row, Col } from 'shards-react'
 
 
 //the top-level component for our app. I've added some basic styling and a flexbox layout for you so your gifs make a nice grid :)
 export default function App() {
+  const imgToGifs = urls.map( item => {
+    return <Switch imgUrl={item.img} gifUrl={item.gif} />
+  })
   return (
     <Layout>
+      {imgToGifs}
     </Layout>
   )
 }
diff --git a/src/02_starter/Img.js b/src/02_starter/Img.js
index 98bfceb..7cb9c4a 100644
--- a/src/02_starter/Img.js
+++ b/src/02_starter/Img.js
@@ -1 +1,11 @@
 //a component that displays an image goes here
+import React from 'react'
+import Button from './Button'
+
+export default function Image(props) {
+  return (
+    <Button onClick={props.onClick}>
+      <img src={props.url} alt={props.alt} width='300px'/>
+    </Button>
+  )
+}
diff --git a/src/02_starter/Switch.js b/src/02_starter/Switch.js
index 6c51ac7..5c8d939 100644
--- a/src/02_starter/Switch.js
+++ b/src/02_starter/Switch.js
@@ -1 +1,13 @@
-//a component that handles the state of our img/gif button goes here
+import React, { useState } from 'react'
+import Image from './Img'
+
+export default function Switch(props) {
+  const { imgUrl, gifUrl } = props
+  const [showImg, setShowImg] = useState(true)
+
+  if(showImg) {
+    return <Image url={imgUrl} alt='img' onClick={() => setShowImg(false)} />
+  } else {
+    return <Image url={gifUrl} alt='gif' onClick={() => setShowImg(true)} />
+  }
+}
diff --git a/src/02_starter/data.js b/src/02_starter/data.js
index 0b7b4e4..5ecb8a5 100644
--- a/src/02_starter/data.js
+++ b/src/02_starter/data.js
@@ -1,8 +1,16 @@
 //the data structure we'll use to build our app
 const urls = [
   {
-    img: '',
-    gif: '',
+    img: 'https://img.webmd.com/dtmcms/live/webmd/consumer_assets/site_images/article_thumbnails/video/caring_for_your_kitten_video/650x350_caring_for_your_kitten_video.jpg',
+    gif: 'https://media.giphy.com/media/hvS1eKlR75hMr0l7VJ/giphy.gif',
+  },
+  {
+    img: 'https://geekologie.com/2019/08/29/googly-eyed-kitten.jpg',
+    gif: 'https://media.giphy.com/media/8OPbx53X3mFoWMw5aO/giphy.gif',
+  },
+  {
+    img: 'https://www.pethealthnetwork.com/sites/default/files/styles/large/public/kittens-in-basket.jpg?itok=7mZDIHOZ',
+    gif: 'https://media.giphy.com/media/142Y941q45XPdm/giphy.gif',
   }
 ]
 
diff --git a/src/index.js b/src/index.js
index e8c592b..c88d24a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
-import App from './01_example/App'
-// import App from './02_starter/App' /*uncomment this import and comment out the one above when you're ready to write your own code*/
+// import App from './01_example/App'
+import App from './02_starter/App' /*uncomment this import and comment out the one above when you're ready to write your own code*/
 
 ReactDOM.render(<App />, document.getElementById('root'))