diff --git a/src/App.js b/src/App.js
index 392ed1f..3850d9b 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,24 +1,34 @@
-import React from 'react';
-import CounterButton from "./components/CounterButton";
-import SpecialTextBox from "./components/SpecialTextBox";
-import Counter from "./components/Counter";
-import SpecialText from "./components/SpecialText";
-import UserButtons from "./components/UserButtons";
-import Thermostat from "./components/Thermostat";
-import Users from "./components/Users";
-import ChangeTemperature from "./components/ChangeTemperature";
-import VideoPlayer from "./components/VideoPlayer";
-import VideoTextBox from "./components/VideoTextBox";
-import CurrentCity from "./components/CurrentCity";
-import CityDropDown from "./components/CityDropDown";
-import SearchTextBox from "./components/SearchTextBox";
-import SortUsers from "./components/SortUsers";
-import ScaleVideo from "./components/ScaleVideo";
-import Modal from "./components/Modal";
-import ShowModal from "./components/ShowModal";
+import React from 'react'
+import CounterButton from "./containers/CounterButtonContainer";
+import SpecialTextBox from "./containers/SpecialTextBoxContainer";
+import Counter from "./containers/CounterContainer";
+import SpecialText from "./containers/SpecialTextContainer";
+import UserButtons from "./containers/UserButtonsContainer";
+import Thermostat from "./containers/ThermostatContainer";
+import Users from "./containers/UsersContainer";
+import ChangeTemperature from "./containers/ChangeTemperatureContainer";
+import VideoPlayer from "./containers/VideoPlayerContainer";
+import VideoTextBox from "./containers/VideoTextBoxContainer";
+import CurrentCity from "./containers/CurrentCityContainer";
+import CityDropDown from "./containers/CityDropDownContainer";
+import SearchTextBox from "./containers/SearchTextBoxContainer";
+import SortUsers from "./containers/SortUsersContainer";
+import ScaleVideo from "./containers/ScaleVideoContainer";
+import Modal from "./containers/ModalContainer";
+import ShowModal from "./containers/ShowModalContainer";
 
-function App() {
-  return (
+class App extends React.Component {
+  
+
+  componentDidMount() {
+    fetch('https://jsonplaceholder.typicode.com/users') 
+      .then(res => res.json())
+      .then(data => {this.props.set(data)})
+        .catch(err => console.log(`Error: ${err}`))
+  }
+
+  render() {
+    return (
       <div className="App">
         <div className="container">
           <CounterButton />
@@ -28,7 +38,7 @@ function App() {
           <UserButtons />
           <br />
           <CityDropDown />
-           <br />
+          <br />
           <ChangeTemperature />
           <br />
           <SearchTextBox />
@@ -52,14 +62,13 @@ function App() {
           <br />
           <VideoPlayer />
           <br />
-          
-          
         </div>
         <div className="container">
           <Users />
         </div>
         <Modal />
       </div>
-  );
+    );
+  }
 }
 export default App;
\ No newline at end of file
diff --git a/src/actions/index.js b/src/actions/index.js
index 78955f4..63139d1 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -1,24 +1,100 @@
+export const INCREASE_COUNTER = "INCREASE_COUNTER";
+export const LOAD_USERS = "LOAD_USERS";
+export const DECREASE_COUNTER = "DECREASE_COUNTER"
+export const SET_SPECIAL_TEXT= "SET_SPECIAL_TEXT"
+export const ADD_USER = "ADD_USER"
+export const REMOVE_USER = "REMOVE_USER"
+export const SET_SEARCH_TEXT = "SET_SEARCH_TEXT"
+export const SET_IS_LOADING = "SET_IS_LOADING"
+export const SET_TEMP = "SET_TEMP"
+export const SET_CURRENT_CITY = "SET_CURRENT_CITY"
+export const SET_VIDEO_URL = "SET_VIDEO_URL"
+export const SET_CURRENT_USER_SORT = "SET_CURRENT_USER_SORT"
+export const SET_VIDEO_SCALE = "SET_VIDEO_SCALE"
+
 export function increaseCounter(){
   return {
-    type:"INCREASE_COUNTER"
+    type: INCREASE_COUNTER
+  }
+}
+
+export function loadUsers(users) {
+  return {
+    type: LOAD_USERS,
+    value: users
   }
 }
 
-export function setSpecialText(txt){
+export function decreaseCounter(){
   return {
-    type:"SET_SPECIAL_TEXT",
-    value:txt
+    type:DECREASE_COUNTER
+  }
+}
+
+export function setSpecialText(text){
+  return {
+    type:SET_SPECIAL_TEXT,
+    value:text
   }
 }
 
 export function addUser(user){
   return {
-    type:"ADD_USER",
+    type:ADD_USER,
     value:user
   }
 }
 export function removeUser(){
   return {
-    type:"REMOVE_USER"
+    type:REMOVE_USER
+  }
+}
+
+export function setSearchText(text){
+  return {
+    type: SET_SEARCH_TEXT,
+    value: text
+  }
+}
+
+export function setIsLoading(isLoading) {
+  return {
+    type:  SET_IS_LOADING,
+    value: isLoading
+  }
+}
+
+export function setTemp(temp) {
+  return {
+    type: SET_TEMP,
+    value: temp
+  }
+}
+
+export function setCurrentCity(city) {
+  return {
+    type: SET_CURRENT_CITY,
+    value: city
+  }
+}
+
+export function setVideoURL(URL) {
+  return {
+    type: SET_VIDEO_URL,
+    value: URL
   }
-}
\ No newline at end of file
+}
+
+export function setCurrentUserSort(sort) {
+  return {
+    type: SET_CURRENT_USER_SORT,
+    value: sort
+  }
+}
+
+export function setVideoScale(scale) {
+  return {
+    type: SET_VIDEO_SCALE,
+    value: scale
+  }
+}
diff --git a/src/components/Counter.js b/src/components/Counter.js
index e858afd..f15c05f 100644
--- a/src/components/Counter.js
+++ b/src/components/Counter.js
@@ -7,4 +7,5 @@ function Counter(props) {
       </div>
   );
 }
-export default Counter;
\ No newline at end of file
+
+export default Counter;
diff --git a/src/components/CounterButton.js b/src/components/CounterButton.js
index df3a778..a97d6a6 100644
--- a/src/components/CounterButton.js
+++ b/src/components/CounterButton.js
@@ -12,7 +12,7 @@ function CounterButton(props) {
         }>Increase Counter By One</button>
         <button onClick={
           ()=>{
-            if(props.increase){
+            if(props.decrease){
               props.decrease();
             }
           }
@@ -20,4 +20,5 @@ function CounterButton(props) {
       </div>
   );
 }
+
 export default CounterButton;
\ No newline at end of file
diff --git a/src/components/SpecialTextBox.js b/src/components/SpecialTextBox.js
index aca3278..3f1318c 100644
--- a/src/components/SpecialTextBox.js
+++ b/src/components/SpecialTextBox.js
@@ -1,6 +1,4 @@
 import React from 'react';
-import {connect} from "react-redux";
-import {setSpecialText} from "../actions";
 
 function SpecialTextBox(props) {
   return (
@@ -15,4 +13,4 @@ function SpecialTextBox(props) {
   );
 }
 
-export default (SpecialTextBox);
+export default SpecialTextBox;
diff --git a/src/components/Users.js b/src/components/Users.js
index 6a04386..fc93657 100644
--- a/src/components/Users.js
+++ b/src/components/Users.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-function Users(props) {
+export default function Users(props) {
   var usersDivs = null;
   if(props.users){
     var sorted = props.users.sort((a,b) => {
@@ -22,4 +22,3 @@ function Users(props) {
       </div>
   );
 }
-export default Users;
\ No newline at end of file
diff --git a/src/containers/AppContainer.js b/src/containers/AppContainer.js
new file mode 100644
index 0000000..470a75e
--- /dev/null
+++ b/src/containers/AppContainer.js
@@ -0,0 +1,10 @@
+import App from '../App';
+import {connect} from 'react-redux';
+import {loadUsers} from '../actions';
+
+const mapDispatchToProps = {
+    set: loadUsers
+}
+
+export default connect(null, mapDispatchToProps)(App)
+
diff --git a/src/containers/ChangeTemperatureContainer.js b/src/containers/ChangeTemperatureContainer.js
new file mode 100644
index 0000000..a01b8a9
--- /dev/null
+++ b/src/containers/ChangeTemperatureContainer.js
@@ -0,0 +1,9 @@
+import ChangeTemparature from '../components/ChangeTemperature';
+import {connect} from 'react-redux';
+import {setTemp} from '../actions';
+
+const mapDispatchToProps = {
+    set: setTemp
+}
+
+export default connect(null, mapDispatchToProps)(ChangeTemparature);
diff --git a/src/containers/CityDropDownContainer.js b/src/containers/CityDropDownContainer.js
new file mode 100644
index 0000000..54de119
--- /dev/null
+++ b/src/containers/CityDropDownContainer.js
@@ -0,0 +1,9 @@
+import {connect} from 'react-redux';
+import {setCurrentCity} from '../actions';
+import CityDropDown from '../components/CityDropDown';
+
+const mapDispatchToProps = {
+    set: setCurrentCity
+}
+
+export default connect(null, mapDispatchToProps)(CityDropDown)
diff --git a/src/containers/CounterButtonContainer.js b/src/containers/CounterButtonContainer.js
new file mode 100644
index 0000000..4cc7886
--- /dev/null
+++ b/src/containers/CounterButtonContainer.js
@@ -0,0 +1,10 @@
+import {connect} from 'react-redux';
+import {increaseCounter, decreaseCounter} from '../actions';
+import CounterButton from '../components/CounterButton';
+
+const mapDispatchToProps = {
+    increase: increaseCounter,
+    decrease: decreaseCounter
+}
+
+export default connect(null, mapDispatchToProps)(CounterButton);
diff --git a/src/containers/CounterContainer.js b/src/containers/CounterContainer.js
new file mode 100644
index 0000000..1f10c7d
--- /dev/null
+++ b/src/containers/CounterContainer.js
@@ -0,0 +1,10 @@
+import Counter from '../components/Counter';
+import {connect} from 'react-redux';
+
+const mapStateToProps = (state) => {
+    return {
+        count: state.currentCount
+    }
+}
+
+export default connect(mapStateToProps)(Counter)
diff --git a/src/containers/CurrentCityContainer.js b/src/containers/CurrentCityContainer.js
new file mode 100644
index 0000000..442a70d
--- /dev/null
+++ b/src/containers/CurrentCityContainer.js
@@ -0,0 +1,10 @@
+import CurrentCity from '../components/CurrentCity';
+import {connect} from 'react-redux';
+
+const mapStateToProps = (state) => {
+    return {
+        text: state.currentCity
+    }
+}
+
+export default connect(mapStateToProps)(CurrentCity)
diff --git a/src/containers/ModalContainer.js b/src/containers/ModalContainer.js
new file mode 100644
index 0000000..05422f0
--- /dev/null
+++ b/src/containers/ModalContainer.js
@@ -0,0 +1,15 @@
+import Modal from '../components/Modal';
+import {connect} from 'react-redux';
+import {setIsLoading} from '../actions';
+
+const mapStateToProps = (state) => {
+    return {
+        isLoading: state.isLoading
+    }
+}
+
+const mapDispatchToProps = {
+    setIsLoading: setIsLoading
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(Modal)
diff --git a/src/containers/ScaleVideoContainer.js b/src/containers/ScaleVideoContainer.js
new file mode 100644
index 0000000..47f7b0c
--- /dev/null
+++ b/src/containers/ScaleVideoContainer.js
@@ -0,0 +1,9 @@
+import {connect} from 'react-redux';
+import {setVideoScale} from '../actions';
+import ScaleVideo from '../components/ScaleVideo';
+
+const mapDispatchToProps = {
+    set: setVideoScale
+}
+
+export default connect(null, mapDispatchToProps)(ScaleVideo);
diff --git a/src/containers/SearchTextBoxContainer.js b/src/containers/SearchTextBoxContainer.js
new file mode 100644
index 0000000..324b25f
--- /dev/null
+++ b/src/containers/SearchTextBoxContainer.js
@@ -0,0 +1,9 @@
+import {connect} from 'react-redux';
+import SearchTextBox from '../components/SearchTextBox';
+import {setSearchText} from '../actions';
+
+const mapDispatchToProps = {
+    set: setSearchText
+}
+
+export default connect(null, mapDispatchToProps)(SearchTextBox);
diff --git a/src/containers/ShowModalContainer.js b/src/containers/ShowModalContainer.js
new file mode 100644
index 0000000..ff20a4c
--- /dev/null
+++ b/src/containers/ShowModalContainer.js
@@ -0,0 +1,9 @@
+import {connect} from 'react-redux';
+import {setIsLoading} from '../actions';
+import ShowModal from '../components/ShowModal';
+
+const mapDispatchToProps = {
+    setIsLoading: setIsLoading
+}
+
+export default connect(null, mapDispatchToProps)(ShowModal)
diff --git a/src/containers/SortUsersContainer.js b/src/containers/SortUsersContainer.js
new file mode 100644
index 0000000..48af026
--- /dev/null
+++ b/src/containers/SortUsersContainer.js
@@ -0,0 +1,9 @@
+import {connect} from 'react-redux';
+import {setCurrentUserSort} from '../actions';
+import SortUsers from '../components/SortUsers';
+
+const mapDispatchToProps = {
+    set: setCurrentUserSort
+}
+
+export default connect(null, mapDispatchToProps)(SortUsers)
diff --git a/src/containers/SpecialTextBoxContainer.js b/src/containers/SpecialTextBoxContainer.js
index 58e9b4c..d1a79ef 100644
--- a/src/containers/SpecialTextBoxContainer.js
+++ b/src/containers/SpecialTextBoxContainer.js
@@ -1,11 +1,9 @@
 import { connect } from 'react-redux';
-import {setSpecialText} from "../actions";
+import {setSpecialText} from "../actions/index";
 import SpecialTextBox from "../components/SpecialTextBox";
 
-
 const mapDispatchToProps = {
    set:setSpecialText
   }
 
-
 export default connect(null,mapDispatchToProps)(SpecialTextBox);
diff --git a/src/containers/SpecialTextContainer.js b/src/containers/SpecialTextContainer.js
index 794bd45..0de35ab 100644
--- a/src/containers/SpecialTextContainer.js
+++ b/src/containers/SpecialTextContainer.js
@@ -1,5 +1,4 @@
 import { connect } from 'react-redux';
-import {setCurrentUser} from "../actions";
 import SpecialText from "../components/SpecialText";
 
 //map a prop called text to the state specialText
diff --git a/src/containers/ThermostatContainer.js b/src/containers/ThermostatContainer.js
new file mode 100644
index 0000000..9678deb
--- /dev/null
+++ b/src/containers/ThermostatContainer.js
@@ -0,0 +1,10 @@
+import Thermostat from '../components/Thermostat';
+import {connect} from 'react-redux';
+
+const mapStateToProps = (state) => {
+    return {
+        temp: state.currentTemp
+    }
+}
+
+export default connect(mapStateToProps)(Thermostat)
diff --git a/src/containers/UserButtonsContainer.js b/src/containers/UserButtonsContainer.js
new file mode 100644
index 0000000..777932c
--- /dev/null
+++ b/src/containers/UserButtonsContainer.js
@@ -0,0 +1,10 @@
+import {connect} from 'react-redux';
+import {addUser, removeUser} from '../actions';
+import UserButtons from '../components/UserButtons';
+
+const mapDispatchToProps = {
+    add: addUser,
+    remove: removeUser
+}
+
+export default connect(null, mapDispatchToProps)(UserButtons)
diff --git a/src/containers/UsersContainer.js b/src/containers/UsersContainer.js
new file mode 100644
index 0000000..ac9831d
--- /dev/null
+++ b/src/containers/UsersContainer.js
@@ -0,0 +1,12 @@
+import Users from '../components/Users';
+import {connect} from 'react-redux';
+
+const mapStateToProps = (state) => {
+    return {
+        users: state.users,
+        firstNameFilter: state.searchText,
+        sortOn: state.currentUserSort
+    }
+}
+
+export default connect(mapStateToProps)(Users)
diff --git a/src/containers/VideoPlayerContainer.js b/src/containers/VideoPlayerContainer.js
new file mode 100644
index 0000000..4b4a0cc
--- /dev/null
+++ b/src/containers/VideoPlayerContainer.js
@@ -0,0 +1,11 @@
+import VideoPlayer from '../components/VideoPlayer';
+import {connect} from 'react-redux';
+
+const mapStateToProps = (state) => {
+    return {
+        URL: state.videoURL,
+        scale: state.videoScale
+    }
+}
+
+export default connect(mapStateToProps)(VideoPlayer)
diff --git a/src/containers/VideoTextBoxContainer.js b/src/containers/VideoTextBoxContainer.js
new file mode 100644
index 0000000..f4f7119
--- /dev/null
+++ b/src/containers/VideoTextBoxContainer.js
@@ -0,0 +1,9 @@
+import {connect} from 'react-redux';
+import {setVideoURL} from '../actions';
+import VideoTextBox from '../components/VideoTextBox';
+
+const mapDispatchToProps = {
+    set: setVideoURL
+}
+
+export default connect(null, mapDispatchToProps)(VideoTextBox);
diff --git a/src/index.js b/src/index.js
index 25f54ba..01905c4 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,10 +1,13 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import App from './App';
+import App from './containers/AppContainer';
 import './index.css';
+import {Provider} from 'react-redux';
+import store from './store';
+
 
 
 ReactDOM.render(
-  <App />,
+  <Provider store={store}><App /></Provider>,
   document.getElementById('root')
 );
diff --git a/src/reducers/index.js b/src/reducers/index.js
index dce7c2c..46c8055 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -1,29 +1,108 @@
+import {combineReducers} from 'redux'
+import {INCREASE_COUNTER, 
+        LOAD_USERS, 
+        DECREASE_COUNTER, 
+        SET_SPECIAL_TEXT, 
+        ADD_USER, 
+        REMOVE_USER,
+        SET_SEARCH_TEXT, 
+        SET_IS_LOADING,
+        SET_TEMP,
+        SET_CURRENT_CITY,
+        SET_VIDEO_URL,
+        SET_CURRENT_USER_SORT,
+        SET_VIDEO_SCALE   
+      } from '../actions';
 
 function currentCount(state=0, action){
-  if(action.type === "INCREASE_COUNTER"){
-    
+  if(action.type === INCREASE_COUNTER){
+    return state + 1;
   }
-  if(action.type === "DECREASE_COUNTER"){
-    
+  if(action.type === DECREASE_COUNTER){
+    return state - 1;
   }
   return state;
 }   
 
 function users(state =[], action){
-  if(action.type === "ADD_USER"){
-
+  if(action.type === ADD_USER){
+    return [...state, action.value];
+  }
+  if(action.type === REMOVE_USER){
+    return state.slice(1);
   }
-  if(action.type === "REMOVE_USER"){
-    
+  if(action.type === LOAD_USERS){
+    return action.value;
   }
   return state;
 }
 
 
 function specialText(state = "", action){
-  if(action.type === "SET_SPECIAL_TEXT"){
+  if(action.type === SET_SPECIAL_TEXT){
+    return action.value;
+  }
+  return state;
+}
+
+function currentCity(state = "", action) {
+  if(action.value === SET_CURRENT_CITY) {
+    return action.value
+  }
+  return state
+}
+
+function isLoading(state = false, action) {
+  if(action.value === SET_IS_LOADING) {
+    return action.value;
+  }
+  return state;
+}
+
+function videoURL(state = "", action) {
+  if(action.value === SET_VIDEO_URL) {
     return action.value;
   }
   return state;
 }
 
+function currentUserSort(state = "", action) {
+  if(action.value === SET_CURRENT_USER_SORT) {
+    return action.value
+  }
+  return state;
+}
+
+function videoScale(state = 1, action) {
+  if(action.value === SET_VIDEO_SCALE) {
+    return state;
+  }
+  return state;
+}
+
+function searchText(state = "", action) {
+  if(action.value === SET_SEARCH_TEXT) {
+    return action.value;
+  }
+  return state;
+}
+
+function currentTemp(state = 0, action) {
+    if(action.value === SET_TEMP) {
+      return action.value
+    }
+    return state
+}
+
+export default combineReducers({
+  currentCount, 
+  users,
+  specialText,
+  currentCity,
+  isLoading,
+  videoURL, 
+  currentUserSort, 
+  videoScale,
+  searchText,
+  currentTemp
+})
\ No newline at end of file