 // Returns:       An unsigned long representing time in hours and minutes 
 // Description:   TODO ____________________________________________________
 // ----------------------------------------------------------------------------------------
-char* get_time()
-{
-  sendNTPpacket(timeServer); // send an NTP packet to a time server
-  unsigned long epoch;
-
-    // wait to see if a reply is available
-  delay(1000);  
-  if ( Udp.parsePacket() ) {  
-    // We've received a packet, read the data from it
-    Udp.read(packetBuffer,NTP_PACKET_SIZE);  // read the packet into the buffer
-
-    //the timestamp starts at byte 40 of the received packet and is four bytes,
-    // or two words, long. First, esxtract the two words:
-
-    unsigned long highWord = word(packetBuffer[40], packetBuffer[41]);
-    unsigned long lowWord = word(packetBuffer[42], packetBuffer[43]);  
-    // combine the four bytes (two words) into a long integer
-    // this is NTP time (seconds since Jan 1 1900):
-    unsigned long secsSince1900 = highWord << 16 | lowWord;               
-
-    // now convert NTP time into everyday time:
-    // Unix time starts on Jan 1 1970. In seconds, that's 2208988800:
-    const unsigned long seventyYears = 2208988800UL;    
-    // subtract seventy years:
-    epoch = secsSince1900 - seventyYears - (5 * 3600);
-
+String get_time() {
+  String timeString = "";
+    if (timeStatus() != timeNotSet) {
+      timeString = hour() + ":";
+      if(minute() < 10) {
+        timeString = timeString + "0";
+      }
+      timeString = timeString + minute() + "  " + month() + " " + day() + " " + year();
   }
   return timeString;
 }
+
+
 
 // ----------------------------------------------------------------------------------------
 // Function Name: sendNTPpacket(IPAddress& address)
 // Parameters:    IP Address
-// Returns:       Unsigned Long
+// Returns:       None
 // Description:   send an NTP request to the time server at the given address
 // ----------------------------------------------------------------------------------------
-unsigned long sendNTPpacket(IPAddress& address)
-{
+void sendNTPpacket(IPAddress &address) {
   // set all bytes in the buffer to 0
   memset(packetBuffer, 0, NTP_PACKET_SIZE);
   // Initialize values needed to form NTP request

// ----------------------------------------------------------------------------------------
void setup_network() {
  
  // TODO: _________________________REMOVE ALL Serial stuff when it works________________________

  // Open serial communications and wait for port to open:
  Serial.begin(serialSpeed);

  // start Ethernet and UDP
  if (Ethernet.begin(mac) == 0) {
    Serial.println("Failed to configure Ethernet using DHCP");
    // no point in carrying on, so do nothing forevermore:
    while(1){}
  }
  Udp.begin(localPort);
}
  
// ----------------------------------------------------------------------------------------

#include <SPI.h>                  // Needed for the Ethernet shield
#include <Ethernet.h>             // Enables internet connectivity, needs pins 10 11 12 13
#include <EthernetUdp.h>          // Needed for the Ethernet shield
#include <Time.h>                 // Needed for easier time functionality



