diff --git a/app/Calendar.js b/app/Calendar.js
index f24801e..8ee5bc7 100644
--- a/app/Calendar.js
+++ b/app/Calendar.js
@@ -118,7 +118,7 @@ class Calendar extends React.Component {
 	render() {
 		return (
 			<View>
-        <View style = {{height: 56, display: 'flex'}}>
+        <View style = {{height: 90, display: 'flex'}}>
           <LinearGradient
             colors={['#f99', 'white']}
             style = {{height: '100%', borderBottomColor:'black', borderBottomWidth:0.5, display: 'flex', justifyContent: 'flex-end', paddingBottom: '2.5%'}}
diff --git a/app/Home.js b/app/Home.js
index 34e9077..2ad3df1 100644
--- a/app/Home.js
+++ b/app/Home.js
@@ -9,6 +9,7 @@ import {
   Modal,
   TouchableHighlight,
   Image,
+  FlatList,
 } from 'react-native';
 
 import {
@@ -19,18 +20,84 @@ import {
   ReloadInstructions,
 } from 'react-native/Libraries/NewAppScreen';
 import styles from './styles/morestyles'
+import liststyles from './styles/liststyles'
 import { url } from './resources/fetchInfo.json'
 import LinearGradient from 'react-native-linear-gradient';
+import StudentWeek from './StudentWeek';
+import { TouchableOpacity } from 'react-native-gesture-handler';
+import { NavigationContainer } from '@react-navigation/native'
+import { createStackNavigator } from '@react-navigation/stack'
+import Calendar from './Calendar';
+import AsyncStorage from '@react-native-community/async-storage'
+
+const STORAGE_KEY = "teacherAnnouncements"
+const Stack = createStackNavigator()
+
+const getCurrentDate=()=>{
+  var date = new Date().getDate();
+  var month = new Date().getMonth() + 1;
+  var year = new Date().getFullYear();
+
+  return year + '-' + month + '-' + date;
+}
+
+const Event = ({item}) => {
+  const calendarIconURI = item.item.image !== undefined?`data:image/png;charset=utf-8;base64,${item.item.image}`:''
+	const [visible, setVisible] = useState(false)
+  const date = item.item.date.split('-')
+  const today = new Date(getCurrentDate())
+  const week = new Date().setDate(new Date().getDate() - 8)
+  const itemDate = new Date(item.item.date)
+
+	const extra = (
+		<>
+			<Text style={{fontSize:20}}>{item.item.text}</Text>
+			<Text style={{fontSize:20}}>Location: {item.item.location}</Text>
+		</>
+  )
+  if (itemDate >= today) {
+    return (
+      <TouchableOpacity style={{display:'flex', borderWidth:2, borderColor: 'black', borderRadius: 8, width: 120, height: 226, marginRight: 10}} onPress={()=>setVisible(!visible)} activeOpacity={0.8}>
+        <View>
+          <Image source = {{calendarIconURI}} style = {{height: '78%', width: '100%', borderTopLeftRadius: 8, borderTopRightRadius: 8}}/>
+          <View style={{height: '22%', paddingHorizontal: '2%'}}>
+            <Text style={{fontSize: 16}}>{item.item.title}</Text>
+            <Text style={{fontSize: 12}}>{`${date[1]}/${date[2]}/${date[0]}`}</Text>
+          </View>
+        </View>
+		  </TouchableOpacity>
+    )
+  }
+  else if (itemDate >= week){
+    return (
+      <TouchableOpacity style={{backgroundColor: '#e3e3e', display:'flex', borderWidth:1, borderColor: 'black', borderRadius: 8, width: 120, height: 226, marginRight: 10}} onPress={()=>setVisible(!visible)} activeOpacity={0.8}>
+      <View>
+        <Image source = {{calendarIconURI}} style = {{height: '78%', width: '100%', borderTopLeftRadius: 8, borderTopRightRadius: 8}}/>
+        <View style={{height: '22%', paddingHorizontal: '2%', backgroundColor: '#e3e3e3', borderBottomLeftRadius: 8, borderBottomRightRadius: 8}}>
+          <Text style={{fontSize: 16}}>{item.item.title}</Text>
+          <Text style={{fontSize: 12}}>{`${date[1]}/${date[2]}/${date[0]}`}</Text>
+        </View>
+      </View>
+    </TouchableOpacity>
+	  )
+  }
+  else {
+    return (
+      null
+    )
+  }
+}
+
 function Home1() {
 
-const [modalVisible, setModalVisible] = useState(true);
+const [modalVisible, setModalVisible] = useState(false);
   return (
     <View>
       <View>
         <Modal animationType="slide" transparent={true} visible={modalVisible}>
           <View style={styles.modal}>
             <View style={{display: 'flex', flexDirection:'row', justifyContent: 'flex-end'}}>
-              <TouchableHighlight onPress={() => {setModalVisible(!modalVisible);}}>
+              <TouchableHighlight onPress={() => {setModalVisible(false);}}>
                 <Image source = {require('./assets/exit.png')} style = {{height: 40, width: 40}}/>
               </TouchableHighlight>
             </View>  
@@ -47,32 +114,109 @@ const [modalVisible, setModalVisible] = useState(true);
     </View>
   )
 }
+
 class Home extends React.Component {
   constructor(props) {
 		super(props)
 		this.state = {
-			data: [],
+      studentData: [],
+      announcementsData:[],
+      challengeData:[],
+      data:[],
 			isLoading:true  
 		}
 	}
-	
-	/*componentDidMount() {
-		fetch(`${url}/api/en/popup`,{
+	addFavorite = (name) => {
+		const favoriteNames = this.state.favoriteNames.slice().map(({name})=>name)
+		const index = favoriteNames.indexOf(name)
+		if (index < 0) {
+			favoriteNames.push(name)
+		}
+		else {
+			favoriteNames.splice(index,1)
+		}
+		favoriteNames.sort()
+		this.setState({favoriteNames:favoriteNames.map(name=>({name:name}))})
+		AsyncStorage.setItem(STORAGE_KEY,JSON.stringify(favoriteNames)).catch(console.log).done()
+	}
+	componentDidMount() {
+		fetch(`${url}/api/en/student`,{
 		  headers: {
 			'Cache-Control': 'no-cache'
 		  }}
 		).then((response) => {
 			return response.text();list 
 		}).then((json) => {
-			this.setState({data: JSON.parse(json),isLoading:false});
+			this.setState({studentData: JSON.parse(json),isLoading:false});
+    }).catch((error) => console.error(error))
+
+    fetch(`${url}/api/en/challenge`,{
+		  headers: {
+			'Cache-Control': 'no-cache'
+		  }}
+		).then((response) => {
+			return response.text();
+		}).then((json) => {
+			this.setState({challengeData: JSON.parse(json),isLoading:false});
 		}).catch((error) => console.error(error))
-  }*/
+    
+    this.getData()
+		this.props.navigation.addListener(
+			'focus',
+			() => {
+				this.getData()
+			}
+    );
+
+    this.getData1()
+		AsyncStorage.getItem(STORAGE_KEY)
+			.then(value=>value==null?[]:JSON.parse(value).map(x=>({name:x})))
+			.then(names=>this.setState({favoriteNames:names}))
+			.catch(console.log)
+			.done()
+  }
+
+  getData1() {
+		fetch(`${url}/api/en/announcements`,{
+			headers: {
+				'Cache-Control': 'no-cache'
+			}
+			}
+		)
+		.then((response) => {
+			return response.text()
+		})
+		.then((txt) => {
+			const data = JSON.parse(txt).data;
+			const teacherNames = [...new Set(data.filter(x=>x.teacher!=null&&x.teacher.trim()!=='').map(x=>x.teacher))];
+			teacherNames.sort()
+			this.setState({data: data, teacherNames: teacherNames.map(x=>({name:x})),isLoading:false});
+		})
+		.catch((error) => console.error(error))
+  }
+  
+  getData() {
+		fetch(`${url}/api/en/events`,{
+		  headers: {
+			'Cache-Control': 'no-cache'
+		  } })
+		  .then((response) => {
+			return response.text();
+		  })
+		  .then((json) => {
+			const data = JSON.parse(json).data
+			data.sort((a,b)=>new Date(b.date).getTime()-new Date(a.date).getTime())
+			this.setState({data: data});
+		  })
+		  .catch((error) => console.error(error))
+	}
   
 	render() {
-		return (
+    const iconURI = this.state.studentData.icon !== undefined?`data:image/png;charset=utf-8;base64,${this.state.studentData.icon}`:`data:image/png;charset-utf-8;base64,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`;
+    return (
       <View>
         
-        <View style = {{height: 56, display: 'flex'}}>
+        <View style = {{height: 90, display: 'flex'}}>
           <LinearGradient
             colors={['#f99', 'white']}
             style = {{height: '100%', borderBottomColor:'black', borderBottomWidth:0.5, display: 'flex', justifyContent: 'flex-end', paddingBottom: '2.5%'}}
@@ -82,36 +226,54 @@ class Home extends React.Component {
          
         </View>
         <Home1></Home1>
-        <ScrollView>
-        <View style = {{height: 210, display: 'flex'}}>
-          <LinearGradient
-            colors={['#f99', 'white']}
-            style = {{height: '100%', borderBottomColor:'black', borderBottomWidth:0.5, display: 'flex', justifyContent: 'flex-end', paddingBottom: '2.5%'}}
-          >
-            <Text style = {{fontSize: 24, fontWeight: 'bold', alignSelf: 'center'}}>Blair</Text>
-          </LinearGradient>
-         
-        </View>
-        <View style = {{height: 210, display: 'flex'}}>
-          <LinearGradient
-            colors={['#f99', 'white']}
-            style = {{height: '100%', borderBottomColor:'black', borderBottomWidth:0.5, display: 'flex', justifyContent: 'flex-end', paddingBottom: '2.5%'}}
-          >
-            <Text style = {{fontSize: 24, fontWeight: 'bold', alignSelf: 'center'}}>Blair</Text>
-          </LinearGradient>
-         
-        </View>
-        <View style = {{height: 210, display: 'flex'}}>
-          <LinearGradient
-            colors={['#f99', 'white']}
-            style = {{height: '100%', borderBottomColor:'black', borderBottomWidth:0.5, display: 'flex', justifyContent: 'flex-end', paddingBottom: '2.5%'}}
-          >
-            <Text style = {{fontSize: 24, fontWeight: 'bold', alignSelf: 'center'}}>Blair</Text>
-          </LinearGradient>
-         
-        </View>
+        <ScrollView style={{height: '100%', backgroundColor: 'white'}}>
 
+          <View style={{height: 275, backgroundColor: 'white', padding: '2%'}}>
+            <View style={{display: 'flex', flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between', marginBottom: '2%'}}>
+              <Text style={liststyles.homeTitle}>What's New?</Text>
+              <TouchableOpacity onPress={()=>this.navigation.navigate(Calendar)}>
+                <Text style={{color: 'blue', textDecorationLine: 'underline'}}>View All</Text>
+              </TouchableOpacity>
+            </View>
+            <ScrollView horizontal='true' style={{height: '105%', display: 'flex', flexDirection: 'row', paddingHorizontal: '2%'}}>
+              <View style={{display:'flex', flexDirection: 'row'}}>
+                <FlatList
+                data={this.state.data}
+                renderItem={item=><Event item={item}/>}
+                keyExtractor={item=>JSON.stringify(item)}
+                horizontal
+                />
+              </View>
+            </ScrollView>
+          </View>
+          
+          <View style={{height: 275, backgroundColor: 'white', padding: '2%'}}>
+            <Text style={liststyles.homeTitle}>Student of the Week</Text>
+            <View style={{display: 'flex', flexDirection: 'row', paddingTop: '5%', paddingHorizontal: '2%', justifyContent: 'space-between'}}>
+              <View style={{display: 'flex', borderWidth: 1, borderColor: 'black', borderRadius: 8, width: '32%', height: '100%'}}>
+                <View style={{height:'70%'}}>
+                  <Image source = {{iconURI}} style = {{height:'100%', width: '100%', borderTopRightRadius: 8, borderTopLeftRadius:8}}/>
+                </View>
+                <View style ={{paddingHorizontal: '2%', height: '15%'}}>
+                  <Text style={{fontWeight: 'bold', fontSize: 18}}>{this.state.studentData.name}</Text>
+                  <Text>Grade {this.state.studentData.year}</Text>
+                </View>
+              </View>
+              <View style={{borderWidth: 1, borderColor: 'black', borderRadius: 8, width: '64%', height: '100%', padding: '2%'}}>
+                <Text style={{fontSize: 16}}><Text style={{fontWeight: 'bold'}}>Hobbies: </Text>{this.state.studentData.hobbies}</Text>
+                <Text style={{fontSize: 16}}><Text style={{fontWeight: 'bold'}}>Achievements: </Text>{this.state.studentData.achievements}</Text>
+                <Text style={{fontSize: 16}}><Text style={{fontWeight: 'bold'}}>Messages: </Text>{this.state.studentData.messages}</Text>
+              </View>
+            </View>
+          </View>
+
+          <TouchableOpacity style={{height: 400, padding: '2%'}}>
+            <Text style={liststyles.homeTitle}>Announcements</Text>
+          </TouchableOpacity>
+
+          
         </ScrollView>
+        
       </View>
 		)
 	}
diff --git a/app/More.js b/app/More.js
index 7a28bdd..65515fe 100644
--- a/app/More.js
+++ b/app/More.js
@@ -30,6 +30,7 @@ import SSLOps, {SSLInfo} from './SSLOps'
 import LunchEvents, {LunchInfo} from './LunchEvents'
 import ChallengeWeek from './ChallengeWeek'
 import Settings from './Settings'
+import Poll from './Poll'
 import Images from './Images'
 import LinearGradient from 'react-native-linear-gradient'
 
@@ -57,7 +58,7 @@ class MoreSwitch extends React.Component {
 					renderItem={({item})=>
 						
 						<TouchableOpacity style={styles.moreitem} onPress={()=>this.props.navigation.navigate(item.key)}>
-							<Image source = {item.img} style = {{height: 40, width: 40, marginRight: 10}}/>
+							<Image source = {item.img} style = {{height: 40, width: 40, marginRight: 10, tintColor: '#e3e3e3'}}/>
 							<Text style={styles.moretext}>{item.name}</Text>
 						</TouchableOpacity>
 					}
diff --git a/app/Poll.js b/app/Poll.js
index 153a1af..1b62029 100644
--- a/app/Poll.js
+++ b/app/Poll.js
@@ -6,6 +6,8 @@ import {
   View,
   Text,
   StatusBar,
+  Image,
+  TouchableOpacity,
 } from 'react-native';
 
 import {
@@ -16,19 +18,54 @@ import {
   ReloadInstructions,
 } from 'react-native/Libraries/NewAppScreen';
 import {WebView} from 'react-native-webview';
+import LinearGradient from 'react-native-linear-gradient';
+import { Linking } from 'react-native';
+import { url } from './resources/fetchInfo.json'
+
 class Poll extends React.Component {
+
+  /*constructor(props) {
+    super(props)
+    this.state = {
+        data: []
+    }
+}
+
+componentDidMount() {
+    fetch(`${url}/api/en/lunchEvents`,{
+        headers: {
+            'Cache-Control': 'no-cache'
+        }
+        }
+    )
+    .then((response) => {
+        return response.text();
+    })
+    .then((json) => {
+        this.setState({data: JSON.parse(json)});
+    })
+    .catch((error) => console.error(error))
+}*/
+
 	render() {
 		return (
-			<WebView
-        source = {{uri: 'https://docs.google.com/forms/d/e/1FAIpQLSfR0XP2yo3TV3egz7aMok56wnP9kG4FQt2v3rHrrayf8uC7Vw/viewform?usp=sf_link'}}
-        javaScriptEnabled={true}
-        domStorageEnabled={true}
-        startInLoadingState={true}
-        style={{marginTop: 20}}
-        cacheEnabled={true}
-        
-      />
-      
+      <View style = {{backgroundColor: 'white'}}>
+        <View style = {{height: 90, display: 'flex'}}>
+          <LinearGradient
+            colors={['#f99', 'white']}
+            style = {{height: '100%', borderBottomColor:'black', borderBottomWidth:0.5, display: 'flex', justifyContent: 'flex-end', paddingBottom: '2.5%'}}
+          >
+            <Text style = {{fontSize: 24, fontWeight: 'bold', alignSelf: 'center'}}>Polls</Text>
+          </LinearGradient>
+         
+        </View>
+        <View style={{backgroundColor: 'white', height: '100%', display: 'flex', alignItems: 'center'}}>
+          <TouchableOpacity  onPress={()=>Linking.openURL("https://google.com")}>
+            <Image source={require('./assets/polls.png')} style={{marginTop: 50, height: 300, width: 300, tintColor: 'red'}}/>
+          </TouchableOpacity>
+          <Text style ={{fontSize: 20, marginTop: 30}}>Press the image to take the poll!</Text>
+        </View>
+      </View>
 		)
 	}
 }
diff --git a/app/assets/polls.png b/app/assets/polls.png
new file mode 100644
index 0000000..ab4cb18
Binary files /dev/null and b/app/assets/polls.png differ
diff --git a/app/assets/unknown.png b/app/assets/unknown.png
new file mode 100644
index 0000000..2eb79d2
Binary files /dev/null and b/app/assets/unknown.png differ
diff --git a/app/resources/fetchInfo.json b/app/resources/fetchInfo.json
index da750a6..bc3cebe 100644
--- a/app/resources/fetchInfo.json
+++ b/app/resources/fetchInfo.json
@@ -1 +1 @@
-{"url":"https://6227632bc899.ngrok.io"}
\ No newline at end of file
+{"url":"http://127.0.0.1:5000"}
\ No newline at end of file
diff --git a/app/styles/liststyles.js b/app/styles/liststyles.js
index a6c4313..3089a4b 100644
--- a/app/styles/liststyles.js
+++ b/app/styles/liststyles.js
@@ -40,6 +40,10 @@ const styles = StyleSheet.create({
     textDecorationStyle: "solid",
     textDecorationColor: "red",
   },
+  homeTitle: {
+    fontSize: 20, 
+    fontWeight: 'bold',
+  },
   title3: {
     fontSize: 28,
   },