diff --git a/app/AddDeleteGroupMembers.js b/app/AddDeleteGroupMembers.js
new file mode 100644
index 0000000..a8176c0
--- /dev/null
+++ b/app/AddDeleteGroupMembers.js
@@ -0,0 +1,117 @@
+import React, { Component } from 'react';
+import { ListView, View, Text, StyleSheet, TouchableOpacity, Button } from 'react-native';
+import AuthAxios from './AuthAxios.js';
+
+export default class GroupMap extends Component {
+  constructor(props) {
+    super(props);
+    this.state =  {
+      nonMembers: new ListView.DataSource({
+        rowHasChanged: (row1, row2) => row1 !== row2
+      }),
+      membersToAdd: [],
+      membersToDelete: []
+    };
+  }
+
+  componentWillMount() {
+    AuthAxios({
+      url: `api/nonGroupUsers?name=${this.props.name}`,
+    })
+    .then(({data}) => {
+      this.setState({
+        nonMembers: this.state.nonMembers.cloneWithRows(data),
+      })
+    })
+    .catch(err => {
+      console.log('there was an error in fetching non members', err);
+    });
+  }
+
+  static navigationOptions = ({navigation}) => ({
+    title: 'Add/Delete Friends'
+  });
+
+  render() {
+    return (
+      <View>
+        <ListView
+          dataSource={this.props.members}
+          renderRow={rowData => this.renderMembersToBeChanged(rowData)}
+          style={styles.listView}
+        />
+        <ListView
+          dataSource={this.state.nonMembers}
+          renderRow={rowData => this.renderNonMembers(rowData)}
+          style={styles.listView}
+        />
+      </View>
+    )
+  }
+
+  renderMembersToBeChanged(data) {
+    return (
+      <View style={styles.container}>
+        <Button
+          onPress={() => this.props.toDelete(data)}
+          title='Delete'
+          style={styles.button}
+        />
+        <View style={styles.nameContainer}>
+          <Text style={styles.name}>{`${data.first} ${data.last}`}</Text>
+        </View>
+      </View>
+    )
+  }
+ 
+  renderNonMembers(data) {
+    return (
+      <View style={styles.container}>
+        <Button
+          onPress={() => this.props.toAdd(data)}
+          title='Add'
+          style={styles.button}
+        />
+        <View style={styles.nameContainer}>
+          <Text style={styles.name}>{`${data.first} ${data.last}`}</Text>
+        </View>
+      </View>
+    )
+  }
+};
+
+let styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    flexDirection: 'row',
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: '#F5FCFF',
+  },
+  nameContainer: {
+    // justifyContent: 'right',
+    flex: 1,
+    marginBottom: 8,
+  },
+  name: {
+    fontSize: 23,
+    // marginBottom: 8,
+    textAlign: 'center',
+  },
+  year: {
+    textAlign: 'right',
+  },
+  button: {
+    width: 100,
+    height: 81,
+  },
+  listView: {
+    paddingTop: 10,
+    backgroundColor: '#F5FCFF',
+  },
+  separator: {
+    flex: 1,
+    height: StyleSheet.hairlineWidth,
+    backgroundColor: '#8E8E8E',
+  },
+});
\ No newline at end of file
diff --git a/app/AddFence.js b/app/AddFence.js
index 775f7f4..a3d0b4f 100644
--- a/app/AddFence.js
+++ b/app/AddFence.js
@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import { View, Text, StyleSheet, Button, Picker, ListView } from 'react-native';
 import {GooglePlacesAutocomplete} from 'react-native-google-places-autocomplete';
-import {endpoint} from './endpoint.js';
 import AuthAxios from './AuthAxios.js';
 
 
diff --git a/app/AddFriendItem.js b/app/AddFriendItem.js
index 05f9d21..6f7b46d 100644
--- a/app/AddFriendItem.js
+++ b/app/AddFriendItem.js
@@ -1,5 +1,4 @@
 import React, { Component } from 'react';
-import {endpoint} from './endpoint.js';
 import { View, Text, StyleSheet, Button } from 'react-native';
 import AuthAxios from './AuthAxios.js';
 
diff --git a/app/AddFriendList.js b/app/AddFriendList.js
index 98a43a9..aeb7450 100644
--- a/app/AddFriendList.js
+++ b/app/AddFriendList.js
@@ -1,5 +1,4 @@
 import React, { Component } from 'react';
-import {endpoint} from './endpoint.js';
 import Contacts from 'react-native-contacts';
 import AddFriendItem from './AddFriendItem.js';
 import { View, Text, StyleSheet, Button, ListView } from 'react-native';
@@ -18,7 +17,6 @@ export default class AddFriendList extends Component {
   };
 
   componentWillMount(){
-    console.log("will mount in addfriend")
     this.checkPermissionAndGet();
   };
 
@@ -29,7 +27,6 @@ export default class AddFriendList extends Component {
   checkPermissionAndGet() {
     Contacts.checkPermission( (err, permission) => {
       // Contacts.PERMISSION_AUTHORIZED || Contacts.PERMISSION_UNDEFINED || Contacts.PERMISSION_DENIED
-      console.log(permission)
       if(permission === 'undefined'){
         Contacts.requestPermission( (err, permission) => {
           // ...
@@ -55,7 +52,6 @@ export default class AddFriendList extends Component {
               data: {friends: friends}
             })
             .then(({data}) => {
-              console.log(friends);
               let friends = data
               friends.sort((a, b) => {
                 if (a.hasApp && b.hasApp) {
diff --git a/app/AllFriendsList.js b/app/AllFriendsList.js
index 69795c7..7f35f03 100644
--- a/app/AllFriendsList.js
+++ b/app/AllFriendsList.js
@@ -1,6 +1,5 @@
 import FriendMap from './FriendMap.js';
 import React, { Component } from 'react';
-import { endpoint } from './endpoint.js';
 import Contacts from 'react-native-contacts';
 import { View, Text, StyleSheet, Button, ListView } from 'react-native';
 import AuthAxios from './AuthAxios.js';
@@ -64,22 +63,18 @@ export default class AllFriendsList extends Component {
 
   renderContacts(friend) {
     const { navigate } = this.props.navigation;
-    // let title = '';
-    // if(friend.showSetting === 'pending') { title = 'Pending'; };
-    // if(friend.showSetting === 'label') { title = 'Home'; }
-    // if(friend.showSetting === 'GPS') { title = 'Office'}
     return (
       <View style={styles.container}>
         <Button
-          style={styles.thumbnail}
+          style={styles.button}
           onPress={() => navigate('FriendMap', {
             data: friend
             })
           }
           title={friend.currentLabel ? friend.currentLabel : 'Pending'}
         />
-        <View style={styles.rightContainer}>
-          <Text style={styles.title}>{`${friend.first} ${friend.last}`}</Text>
+        <View style={styles.nameContainer}>
+          <Text style={styles.name}>{`${friend.first} ${friend.last}`}</Text>
         </View>
       </View>
     )
@@ -94,11 +89,11 @@ let styles = StyleSheet.create({
     alignItems: 'center',
     backgroundColor: '#F5FCFF',
   },
-  rightContainer: {
+  nameContainer: {
     // justifyContent: 'right',
     flex: 1,
   },
-  title: {
+  name: {
     fontSize: 20,
     marginBottom: 8,
     textAlign: 'center',
@@ -106,7 +101,7 @@ let styles = StyleSheet.create({
   year: {
     textAlign: 'right',
   },
-  thumbnail: {
+  button: {
     width: 53,
     height: 81,
   },
diff --git a/app/CreateGroup.js b/app/CreateGroup.js
index 396f56a..197319a 100644
--- a/app/CreateGroup.js
+++ b/app/CreateGroup.js
@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import CheckBox from 'react-native-checkbox';
-import { endpoint } from './endpoint.js';
 import { View, Text, StyleSheet, TextInput, ListView, Picker, Button } from 'react-native';
 import AuthAxios from './AuthAxios.js';
 
@@ -20,13 +19,11 @@ export default class CreateGroup extends Component {
   }
 
   componentWillMount() {
-
     AuthAxios({
       url: `/api/friends?groups=true`
     })
     .then(({data}) => {
       let friends = data;
-      console.log(friends);
       this.setState({
         friends: this.state.friends.cloneWithRows(friends),
       })
@@ -43,38 +40,16 @@ export default class CreateGroup extends Component {
       users: this.state.users,
       privacy: this.state.privacy,
     };
-
-
     AuthAxios({
       url: `/api/groups`,
       method: `post`,
       data:{groupSettings: groupSettings}
     })
     .then(({data}) => {
-      console.log('Your group was created')
     })
     .catch((error) => {
       alert('There was a problem creating your group')
     })
-    
-/*    fetch(`${endpoint}/api/groups`, {
-      method: 'POST',
-      headers: {
-        'Accept': 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({groupSettings: groupSettings})
-    })
-      .then(function(response) {
-        return response.json();
-      })
-      .then((friends) => {
-        console.log(friends);
-      })
-      .catch((error) => {
-        console.log('There was an error in fetching your data: ', error);
-        return error;
-      });*/
     const { navigate } = this.props.navigation;
     navigate('GroupsList');
   }
@@ -82,7 +57,6 @@ export default class CreateGroup extends Component {
   handleUserChange(userObj) {
     let userArr = this.state.users;
     let index = userArr.indexOf(userObj);
-    console.log(userArr, index, userObj);
     if(index === -1) {
       userArr.push(userObj);
     } else {
@@ -92,13 +66,8 @@ export default class CreateGroup extends Component {
     this.setState({
       users: userArr
     })
-    console.log(this.state);
   }
 
-  // static navigationOptions = {
-  //   title: ({state}) => (state.params.title)
-  // };
-
   static navigationOptions = ({ navigation }) => {
     title: navigation.state.params.title
   }
diff --git a/app/FriendMap.js b/app/FriendMap.js
index 08d1a23..3546f89 100644
--- a/app/FriendMap.js
+++ b/app/FriendMap.js
@@ -1,26 +1,63 @@
 import React, { Component } from 'react';
-import { View, Text, StyleSheet, Image } from 'react-native';
 /*import { MapView } from 'react-native-maps';*/
+import { View, Text, StyleSheet, Image, Switch } from 'react-native';
+import AuthAxios from './AuthAxios.js';
 
 export default class FriendMap extends Component {
   constructor(props) {
     super(props);
-    this.state =  {};
-    console.log(this.props.navigation.state.params);
+
+    let {showFriendSetting} = this.props.navigation.state.params.data;
+    let showLabel = (showFriendSetting === 'label' ? true : false); 
+
+    this.state =  {
+      showLabel: showLabel
+    };
+    this.switchChange = this.switchChange.bind(this);
+  }
+
+  switchChange() {
+    this.setState({
+      showLabel: !this.state.showLabel
+    })
+    let {id} = this.props.navigation.state.params.data;
+    let privacy = (this.state.showLabel ? 'GPS' : 'Label');
+    AuthAxios({
+      url: `/api/friends/${id}`,
+      method: 'put',
+      data: {privacy: privacy}
+    })
+    .then(({data}) => {
+    })
+    .catch(err => {
+      console.log(err);
+    }) 
   }
 
   static navigationOptions = ({navigation}) => ({
     title: navigation.state.params.data.first
   });
 
-  render() {
+  whichPageToRender () {
     const { data } = this.props.navigation.state.params;
-    console.log(data);
     if(data.showSetting === 'GPS') { return this.renderGPS(data); }
     if(data.showSetting === 'label') { return this.renderLabel(data); }
     if(data.showSetting === 'pending') { return this.renderPending(data); }
   }
 
+  render() {
+    return (
+      <View>
+      <Switch
+          onValueChange={this.switchChange}
+          value={this.state.showLabel}
+        />
+        <Text>{this.state.showLabel ? 'Show Only Label' : 'Show GPS'}</Text>
+        {this.whichPageToRender()}
+      </View>
+    )
+  }
+
   renderPending(data) {
     return (
       <View style={{marginTop: 10}}>
diff --git a/app/GroupMap.js b/app/GroupMap.js
index 6a35dc2..ed90107 100644
--- a/app/GroupMap.js
+++ b/app/GroupMap.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
-import { endpoint } from './endpoint.js';
-import { ListView, View, Text, StyleSheet, TouchableOpacity } from 'react-native';
+import { ListView, View, Text, StyleSheet, TouchableOpacity, Button, Switch } from 'react-native';
 import AuthAxios from './AuthAxios.js';
+import AddDeleteGroupMembers from './AddDeleteGroupMembers.js';
 
 export default class GroupMap extends Component {
   constructor(props) {
@@ -9,21 +9,39 @@ export default class GroupMap extends Component {
     this.state =  {
       members: new ListView.DataSource({
         rowHasChanged: (row1, row2) => row1 !== row2
-      })
+      }),
+      nonMembers: new ListView.DataSource({
+        rowHasChanged: (row1, row2) => row1 !== row2
+      }),
+      membersToAdd: [],
+      membersToDelete: [],
+      showLabel: false,
+      addAndDelete: false
     };
+    this.changeToEditGroup = this.changeToEditGroup.bind(this);
+    this.updateGroupMembers = this.updateGroupMembers.bind(this);
+    this.addMember = this.addMember.bind(this);
+    this.removeMember = this.removeMember.bind(this);
+    this.updateGroupMembers = this.updateGroupMembers.bind(this);
+    this.switchChange = this.switchChange.bind(this);
   }
 
   componentWillMount() {
-    console.log('GROUPMAP',this.props.navigation.state.params)
-    let {name} = this.props.navigation.state.params.data;
-    fetch(`${endpoint}/api/groupUsers?name=${name}`)
-    .then(response => {
-      return response.json();
+    let {name, privacy} = this.props.navigation.state.params.data;
+    let showLabel = (privacy === 'label' ? true : false);
+    AuthAxios({
+      url: `/api/groupUsers?name=${name}`
     })
-    .then(members => {
-      console.log(members);
+    .then(({data}) => {
+      let newDataSource = new ListView.DataSource({
+        rowHasChanged: (row1, row2) => row1 !== row2
+      });
       this.setState({
-        members: this.state.members.cloneWithRows(members)
+        members: newDataSource.cloneWithRows(data),
+        membersToAdd: [],
+        membersToDelete: [],
+        showLabel: showLabel,
+        addAndDelete: false
       });
     })
     .catch(err => {
@@ -31,33 +49,155 @@ export default class GroupMap extends Component {
     });
   };
 
+  changeToEditGroup() {
+    this.setState({
+      addAndDelete: !this.state.addAndDelete
+    })
+  }
+
+  updateGroupMembers() {
+    let groupChanges = {
+      toAdd: this.state.membersToAdd,
+      toDelete: this.state.membersToDelete,
+    }
+    let {name} = this.props.navigation.state.params.data;
+    AuthAxios({
+      url: `/api/groupUsers?name=${name}`,
+      method: 'put',
+      data: JSON.stringify(groupChanges),
+    })
+    .then(({data}) => {
+      this.componentWillMount();
+    })
+    .catch(err => {
+      console.log(err);
+    })
+  }
+
+  addMember(friendData) {
+    let membersToAdd = this.state.membersToAdd;
+    let index = membersToAdd.indexOf(friendData);
+    if(index === -1) {
+      membersToAdd.push(friendData);
+    } else {
+      userArr.splice(index, 1);
+    }
+    this.setState({
+      membersToAdd: membersToAdd
+    })
+  }
+
+  removeMember(friendData) {
+    let membersToDelete = this.state.membersToDelete;
+    let index = membersToDelete.indexOf(friendData);
+    if(index === -1) {
+      membersToDelete.push(friendData);
+    } else {
+      membersToDelete.splice(index, 1);
+    }
+    this.setState({
+      membersToDelete: membersToDelete
+    })
+  }
+
+  switchChange() {
+    this.setState({
+      showLabel: !this.state.showLabel
+    });
+    let {name} = this.props.navigation.state.params.data;
+    let privacy = (this.state.showLabel ? 'GPS' : 'label');
+    AuthAxios({
+      url: `/api/groups?name=${name}`,
+      method: 'put',
+      data: {privacy: privacy}
+    })
+    .then(({data}) => {
+      console.log('Successful update', data.privacy);
+    })
+    .catch(err => {
+      console.log('there was an error in fetching members', err);
+    });
+  }
+
   static navigationOptions = ({navigation}) => ({
     title: navigation.state.params.data.name
   });
 
   render() {
-    const params = this.props.navigation.state.params;
+    const { data } = this.props.navigation.state.params;
     return (
       <View>
-        <ListView
-          dataSource={this.state.members}
-          renderRow={(rowData) => this.renderMembers(rowData) }
+        <Button
+          onPress={() => !this.state.addAndDelete ? this.changeToEditGroup() : this.updateGroupMembers() }
+          title={ !this.state.addAndDelete ? 'Add/Delete Friends' : 'Confirm'}
         />
+        <Switch
+          onValueChange={this.switchChange}
+          value={this.state.showLabel}
+        />
+        <Text>{this.state.showLabel ? 'Show Only Label' : 'Show GPS'}</Text>
+        {this.state.addAndDelete ? <AddDeleteGroupMembers members={this.state.members} name={data.name} toAdd={this.addMember} toDelete={this.removeMember} /> : this.renderNoChangeList()}
       </View>
     );
   }
 
+  renderNoChangeList() {
+    return (
+      <ListView
+        dataSource={this.state.members}
+        renderRow={(rowData) => this.renderMembers(rowData) }
+        style={styles.listView}
+      />
+    )
+  }
+
   renderMembers(memberData) {
     const { navigate } = this.props.navigation;
     return (
       <TouchableOpacity
         onPress={() => navigate('FriendMap', {data: memberData}) }
       >
-        <View>
+        <View style={styles.nameContainer}>
           <Text style={{textAlign: 'left', fontSize: 23}}>{memberData.first}</Text>
-          <Text style={{textAlign: 'right', fontSize: 23}}>{memberData.currentLabel ? memberData.currentLabel : 'Pending'}</Text>
+          <Text style={{textAlign: 'left', fontSize: 18}}>{memberData.currentLabel ? memberData.currentLabel : 'Pending'}</Text>
         </View>
       </TouchableOpacity>
     )
   }
-}
\ No newline at end of file
+};
+
+let styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    flexDirection: 'row',
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: '#F5FCFF',
+  },
+  nameContainer: {
+    // justifyContent: 'right',
+    flex: 1,
+    marginBottom: 8,
+  },
+  name: {
+    fontSize: 23,
+    // marginBottom: 8,
+    textAlign: 'center',
+  },
+  year: {
+    textAlign: 'right',
+  },
+  button: {
+    width: 100,
+    height: 81,
+  },
+  listView: {
+    paddingTop: 10,
+    backgroundColor: '#F5FCFF',
+  },
+  separator: {
+    flex: 1,
+    height: StyleSheet.hairlineWidth,
+    backgroundColor: '#8E8E8E',
+  },
+});
\ No newline at end of file
diff --git a/app/GroupsList.js b/app/GroupsList.js
index 5bfb6e1..8261142 100644
--- a/app/GroupsList.js
+++ b/app/GroupsList.js
@@ -1,5 +1,4 @@
 import React, { Component } from 'react';
-import { endpoint } from './endpoint.js';
 import { Button, View, Text, StyleSheet, ListView, TouchableOpacity } from 'react-native';
 import AuthAxios from './AuthAxios.js';
 
@@ -14,14 +13,11 @@ export default class GroupsList extends Component {
   }
 
   componentWillMount () {
-    console.log('getgroups')
-
     AuthAxios({
       url: `/api/groups`
     })
     .then(({data}) => {
       let groups = data;
-      console.log(groups);
       this.setState({
         groups: this.state.groups.cloneWithRows(groups)
       });
diff --git a/app/HomeFavorite.js b/app/HomeFavorite.js
index a668460..be915e3 100644
--- a/app/HomeFavorite.js
+++ b/app/HomeFavorite.js
@@ -1,5 +1,4 @@
 import React, { Component } from 'react';
-import { endpoint } from './endpoint.js';
 import { Button, View, Text, StyleSheet, ListView, TouchableOpacity } from 'react-native';
 import AuthAxios from './AuthAxios.js';
 
@@ -14,7 +13,6 @@ export default class HomeFavorite extends Component {
   }
 
   componentWillMount() {
-    console.log('HOME FAVORITE')
     // let {name} = this.props.navigation.state.params.data;
 
     AuthAxios({
diff --git a/app/LogOut.js b/app/LogOut.js
index d0c5b98..eb9be8b 100644
--- a/app/LogOut.js
+++ b/app/LogOut.js
@@ -1,5 +1,4 @@
 import React, { Component } from 'react';
-import { endpoint } from './endpoint.js';
 import { ListView, View, Text, StyleSheet } from 'react-native';
 
 export default class LogOut extends Component {
diff --git a/app/Settings.js b/app/Settings.js
index 0d02e6d..2d01c5e 100644
--- a/app/Settings.js
+++ b/app/Settings.js
@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import { View, Button, Text, Picker, Switch, StyleSheet } from 'react-native';
-import { endpoint } from './endpoint.js';
 import FriendMap from './FriendMap.js';
 import AuthAxios from './AuthAxios.js';