diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..513fa7d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+__pycache__/StockData.cpython-37.pyc
+__pycache__/
+*.pyc
diff --git a/StockData.py b/StockData.py
index 567401e..04d9f4d 100644
--- a/StockData.py
+++ b/StockData.py
@@ -1,10 +1,7 @@
 # StockData.py
 # Andrew Dinh
 # Python 3.6.1
-# Description: 
-'''
-Returns all available dates and prices for each stock requested.
-'''
+# Description: Returns all available dates and prices for each stock requested.
 
 # Alpha Vantage API Key: O42ICUV58EIZZQMU
 # Barchart API Key: a17fab99a1c21cd6f847e2f82b592838
@@ -13,119 +10,178 @@ Returns all available dates and prices for each stock requested.
 
 apiAV = 'O42ICUV58EIZZQMU'
 apiBarchart = 'a17fab99a1c21cd6f847e2f82b592838'
-apiTiingo = '2e72b53f2ab4f5f4724c5c1e4d5d4ac0af3f7ca8'
+apiTiingo = '2e72b53f2ab4f5f4724c5c1e4d5d4ac0af3f7ca8' # Limited to 400 requests/day
 
 import requests, json
-'''
-def install(package):
-  if hasattr(pip, 'main'):
-        pip.main(['install', package])
-    else:
-        pip._internal.main(['install', package])
-'''
+import importlib.util, sys # To check whether a package is installed
+from datetime import datetime
+
 class Stock:
-  def __init__(self, newStock = '', newfirstLastDates = [], newDates = []):
-    self.name = newStock
-    self.firstLastDates = newfirstLastDates
+
+  def __init__(self, newName = '', newfirstLastDates = [], newAbsFirstLastDates = [], newfinalDatesAndClose = [], newAllLists = []):
+    self.name = newName                             # Name of stock
+    self.firstLastDates = newfirstLastDates         # Dates that at least 2 sources have (or should it be all?) - Maybe let user decide
+    self.absFirstLastDates = newAbsFirstLastDates   # Absolute first and last dates from all sources
+    self.finalDatesAndClose = newfinalDatesAndClose # All available dates
+    '''
+    Format: 
+    # List from each source containing: [firstDate, lastDate, allDates, values, timeFrame]
+    # firstDate & lastDate = '2018-12-18' (year-month-date)
+    allDates = ['2018-12-17', '2018-12-14'] (year-month-date)
+    values (close) = ['164.6307', 164.6307]
+    timeFrame = [days, weeks, years]
+    '''
+    self.allLists = newAllLists
+  '''
+  def set(self, newName, newfirstLastDates, newAbsFirstLastDates, newDates, newListIEX, newListAV, newListTiingo):
+    self.name = newName                             # Name of stock
+    self.firstLastDates = newfirstLastDates         # Dates that at least 2 sources have (or should it be all?) - Maybe let user decide
+    self.absFirstLastDates = newAbsFirstLastDates   # Absolute first and last dates from all sources
+    self.dates = newDates                           # All available dates
+
+    # List from each source containing: ['firstDate', 'lastDate', allDates, values]
+    self.listIEX = newListIEX                     # Dates available from IEX
+    self.listAV = newListAV                       # Dates available from AV
+    self.listTiingo = newListTiingo               # Dates available from Tiingo
+
+  def setFirstLastDates(newFirstLastDates):
+    self.firstLastDates = newFirstLastDates
+  def setAbsFirstLastDates(newAbsFirstLastDates):
+    self.absFirstLastDates = newAbsFirstLastDates
+  def setDates(newDates):
     self.dates = newDates
+  def setListIEX(newListIEX):
+    self.listIEX = newListIEX
+  def setListAV(newListAV):
+    self.listAV = newListAV
+  def setListTiingo(newListTiingo):
+    self.listTiingo = newListTiingo
+  '''
 
-  def getDates(self): # returns beginning and end dates available
-    print("Getting available dates for", self, "...")
-    # Gets first and last possible dates from each source
-    # Also gets all dates from each source
-    
-    # IEX
-    print("\nDates from IEX...")
-    firstLastDatesIEX = Stock.getDatesIEX(self, 'firstLast')
-    print("First and last dates:", firstLastDatesIEX)
-    print("Adding dates available to datesIEX")
-    datesIEX = Stock.getDatesIEX(self, 'all')
-    #print("All dates (recent first):", datesIEX, "\n") # Uncomment line to view output
-
-    # Alpha Vantage
-    print("\nDates from Alpha Vantage...")
-    firstLastDatesAV = Stock.getDatesAV(self, 'firstLast')
-    print("First and last dates:", firstLastDatesAV)
-    print("Adding dates available to datesAV")
-    datesAV = Stock.getDatesAV(self, 'all')
-    #print("All dates (recent first):", datesAV, "\n") # Uncomment line to view output
-    
-    # Tiingo
-    print("\nDates from Tiingo...")
-    firstLastDatesTiingo = Stock.getDatesTiingo(self, 'firstLast')
-    print("First and last dates:", firstLastDatesTiingo)
-    print("Adding dates available to datesTiingo")
-    datesTiingo = Stock.getDatesTiingo(self, 'all')
-    #print("All dates (recent first):", datesTiingo, "\n") # Uncomment line to view output
-
-  def getDatesIEX(self, which):
-    url = ''.join(('https://api.iextrading.com/1.0/stock/', self, '/chart/5y'))
+  def getIEX(self):
+    url = ''.join(('https://api.iextrading.com/1.0/stock/', self.name, '/chart/5y'))
     #link = "https://api.iextrading.com/1.0/stock/spy/chart/5y"
-    #print("URL:", url)
+    print("\nSending request to:", url)
     f = requests.get(url)
     json_data = f.text
     loaded_json = json.loads(json_data)
-    dates = []
-    if which == 'firstLast':
-      # Find firstDate (comes first)
-      firstLine = loaded_json[0]
-      #print("firstLine:", firstLine)
-      firstDate = firstLine['date']
-      #print("firstDate:",firstDate)
-      # Find finalDate (comes last)
-      #print("Length:", len(loaded_json))
-      lastLine = loaded_json[-1] # Returns last value of the list (Equivalent to len(loaded_json)-1)
-      #print("lastLine:", lastLine)
-      finalDate = lastLine['date']
-      #print("Final date:", finalDate)
-      dates.append((firstDate, finalDate))
-    elif which == 'all':
-#       for i in range(0, len(loaded_json), 1): # If you want to do oldest first
-        for i in range(len(loaded_json)-1, 0, -1):
-          line = loaded_json[i]
-          date = line['date']
-          dates.append(date)
-    return dates
+    listIEX = []
 
-  def getDatesAV(self, which):
-    url = ''.join(('https://www.alphavantage.co/query?function=TIME_SERIES_MONTHLY&symbol=', self, '&apikey=', apiAV))
+    print("\nFinding first and last date")
+    # Adding (firstDate, lastDate) to listIEX
+    # Find firstDate (comes first)
+    firstLine = loaded_json[0]
+    #print("firstLine:", firstLine)
+    firstDate = firstLine['date']
+    #print("firstDate:",firstDate)
+    # Find lastDate (comes last)
+    lastLine = loaded_json[-1] # Returns last value of the list (Equivalent to len(loaded_json)-1)
+      #print("lastLine:", lastLine)
+    lastDate = lastLine['date']
+    #print("last date:", lastDate)
+    listIEX.append(firstDate)
+    listIEX.append(lastDate)
+    print(listIEX[0], ',', listIEX[1])
+
+    print("\nFinding all dates given")
+    allDates = []
+#   for i in range(0, len(loaded_json), 1): # If you want to do oldest first
+    for i in range(len(loaded_json)-1, -1, -1):
+      line = loaded_json[i]
+      date = line['date']
+      allDates.append(date)
+    listIEX.append(allDates)
+    #print(listIEX[1])
+    print("Uncomment above line in code to see output")
+
+    print("\nFinding close values for each date")
+    values = []
+#   for i in range(0, len(loaded_json), 1): # If you want to do oldest first
+    for i in range(len(loaded_json)-1, -1, -1):
+      line = loaded_json[i]
+      value = line['close']
+      values.append(value)
+    listIEX.append(values)
+    #print(listIEX[3])
+    print("Uncomment above line in code to see output")
+
+    print("\nFinding time frame given [days, weeks, years]")
+    timeFrame = []
+    d1 = datetime.strptime(firstDate, "%Y-%m-%d")
+    d2 = datetime.strptime(lastDate, "%Y-%m-%d")
+    timeFrameDays = abs((d2 - d1).days)
+    #print(timeFrameDays)
+    timeFrameYears = float(timeFrameDays / 365)
+    timeFrameWeeks = float(timeFrameDays / 7)
+    timeFrame.append(timeFrameDays)
+    timeFrame.append(timeFrameWeeks)
+    timeFrame.append(timeFrameYears)
+    listIEX.append(timeFrame)
+    print(listIEX[4])
+
+    return listIEX
+
+  def getAV(self):
+    listAV = []
+    url = ''.join(('https://www.alphavantage.co/query?function=TIME_SERIES_MONTHLY&symbol=', self.name, '&apikey=', apiAV))
     # https://www.alphavantage.co/query?function=TIME_SERIES_MONTHLY&symbol=MSFT&apikey=demo
-    #print("URL:", url)
+    print("\nSending request to:", url)
     f = requests.get(url)
     json_data = f.text
     loaded_json = json.loads(json_data)
     #print(loaded_json['Monthly Time Series'])
     monthlyTimeSeries = loaded_json['Monthly Time Series']
     #print(monthlyTimeSeries)
-    #print(len(monthlyTimeSeries))
-    #length = len(monthlyTimeSeries)
-    #print(monthlyTimeSeries['2018-12-17'])
-    #print(type(monthlyTimeSeries))
     listOfDates = list(monthlyTimeSeries)
     #print(listOfDates)
-    dates = []
-    if which == 'firstLast':
-       firstDate = listOfDates[-1]
-       lastDate = listOfDates[0]
-       #print("firstDate:", firstDate)
-       #print("lastDate:", lastDate)
-       dates.append((firstDate, lastDate))
-    elif which == 'all':
-      dates = listOfDates
-    return dates
 
-  def getDatesTiingo(self, which):
+    firstDate = listOfDates[-1]
+    lastDate = listOfDates[0]
+    #print("firstDate:", firstDate)
+    #print("lastDate:", lastDate)
+    listAV.append(firstDate)
+    listAV.append(lastDate)
+    listAV.append(listOfDates)
+
+    print("\nFinding first and last date")
+    print(listAV[0], ',', listAV[1])
+    print("\nFinding all dates given")
+    #print(listAV[2])
+    print("Uncomment above line in code to see output")
+
+    print("\nFinding close values for each date")
+    values = []
+    for i in range(0, len(listOfDates), 1):
+      temp = listOfDates[i]
+      loaded_json2 = monthlyTimeSeries[temp]
+      value = loaded_json2['4. close']
+      values.append(value)
+    listAV.append(values)
+    #print(listOfDates[0])
+    #i = listOfDates[0]
+    #print(monthlyTimeSeries[i])
+    #print(listAV[3])
+    print("Uncomment above line in code to see output")
+
+    print("\nFinding time frame given [days, weeks, years]")
+    timeFrame = []
+    d1 = datetime.strptime(firstDate, "%Y-%m-%d")
+    d2 = datetime.strptime(lastDate, "%Y-%m-%d")
+    timeFrameDays = abs((d2 - d1).days)
+    #print(timeFrameDays)
+    timeFrameYears = float(timeFrameDays / 365)
+    timeFrameWeeks = float(timeFrameDays / 7)
+    timeFrame.append(timeFrameDays)
+    timeFrame.append(timeFrameWeeks)
+    timeFrame.append(timeFrameYears)
+    listAV.append(timeFrame)
+    print(listAV[4])
+
+    return listAV
+
+  def getTiingo(self):
     '''
-    headers = {
-       'Content-Type': 'application/json',
-       'Authorization' : 'Token <TOKEN>'
-       }
-    requestResponse = requests.get("https://api.tiingo.com/api/test/",
-                                  headers=headers)
-    print(requestResponse.json())
-
     #OR we can use the token directly in the url
-
     headers = {
        'Content-Type': 'application/json'
        }
@@ -138,12 +194,12 @@ class Stock:
       'Content-Type': 'application/json',
       'Authorization' : token
        }
-    url = ''.join(('https://api.tiingo.com/tiingo/daily/', self))
+    url = ''.join(('https://api.tiingo.com/tiingo/daily/', self.name))
+    print("\nSending request to:", url)
     requestResponse = requests.get(url, headers=headers)
     #print(requestResponse.json())
     loaded_json = requestResponse.json()
     #print(loaded_json)
-    #print(len(loaded_json))
     '''
     list1 = list(loaded_json)
     for i in range (0, len(list1), 1):
@@ -154,48 +210,261 @@ class Stock:
     print(list1[startNum])
     print(list1[endNum])
     '''
+    listTiingo = []
+
+    print("\nFinding first and last date")
     firstDate = loaded_json['startDate']
-    finalDate = loaded_json['endDate']
+    lastDate = loaded_json['endDate']
     #print(firstDate)
-    #print(finalDate)
+    #print(lastDate)
+    listTiingo.append(firstDate)
+    listTiingo.append(lastDate)
+    print(listTiingo[0], ',', listTiingo[1])
+
+    print("\nFinding all dates given")
     dates = []
-    if which == 'firstLast':
-      #print("URL:", url)
-      dates.append((firstDate, finalDate))
-    elif which == 'all':
-      url2 = ''.join((url, '/prices?startDate=', firstDate, '&endDate=', finalDate))
-      # https://api.tiingo.com/tiingo/daily/<ticker>/prices?startDate=2012-1-1&endDate=2016-1-1
-      #print("Second URL:", url2)
-      requestResponse2 = requests.get(url2, headers=headers)
-      loaded_json2 = requestResponse2.json()
-      #print(loaded_json2)
-      #print(len(loaded_json2))
-      '''
-      print(loaded_json2[0])
-      temp = loaded_json2[0]
-      temp2 = temp['date']
-      temp3 = temp2.split('T00:00:00.000Z')
-      print(temp2)
-      print(temp3)
-      print(temp3[0])
-      print(temp3[1])
-      '''
-      for i in range(len(loaded_json2)-1, 0, -1):
-        line = loaded_json2[i]
-        dateWithTime = line['date']
-        temp = dateWithTime.split('T00:00:00.000Z')
-        date = temp[0]
-        dates.append(date)
-    return dates
+    values = [] # Used loop for finding values
+    url2 = ''.join((url, '/prices?startDate=', firstDate, '&endDate=', lastDate))
+    # https://api.tiingo.com/tiingo/daily/<ticker>/prices?startDate=2012-1-1&endDate=2016-1-1
+    print("\nSending request to:", url2)
+    requestResponse2 = requests.get(url2, headers=headers)
+    loaded_json2 = requestResponse2.json()
+    #print(loaded_json2)
+    #print(len(loaded_json2))
+    for i in range(len(loaded_json2)-1, -1, -1):
+      line = loaded_json2[i]
+      dateWithTime = line['date']
+      temp = dateWithTime.split('T00:00:00.000Z')
+      date = temp[0]
+      dates.append(date)
 
-def main():
-  #if __name__ == '__main__':
-        #  install('requests')
+      value = line['close']
+      values.append(value)
+    listTiingo.append(dates)
+    #print(listTiingo[2])
+    print("Uncomment above line in code to see output")
 
-  stock = 'spy'
-  spy = Stock(stock)
-  #print(spy.name)
-  Stock.getDates(stock)
-  #Stock.printDates(spy)
+    print("Finding close values for each date")
+    # Used loop from finding dates
+    listTiingo.append(values)
+    #print(listTiingo[3])
+    print("Uncomment above line in code to see output")
 
-main()
+    print("Finding time frame given [days, weeks, years]")
+    timeFrame = []
+    d1 = datetime.strptime(firstDate, "%Y-%m-%d")
+    d2 = datetime.strptime(lastDate, "%Y-%m-%d")
+    timeFrameDays = abs((d2 - d1).days)
+    #print(timeFrameDays)
+    timeFrameYears = float(timeFrameDays / 365)
+    timeFrameWeeks = float(timeFrameDays / 7)
+    timeFrame.append(timeFrameDays)
+    timeFrame.append(timeFrameWeeks)
+    timeFrame.append(timeFrameYears)
+    listTiingo.append(timeFrame)
+    print(listTiingo[4])
+
+    return listTiingo
+
+  def getFirstLastDate(self, listOfFirstLastDates):
+    listOfFirstDates = []
+    listOfLastDates = []
+    #print(len(listOfFirstLastDates))
+    for i in range (0, len(listOfFirstLastDates), 1):
+      firstLastDates = listOfFirstLastDates[i]
+      firstDate = firstLastDates[0]
+      lastDate = firstLastDates[1]
+      listOfFirstDates.append(firstDate)
+      listOfLastDates.append(lastDate)
+    #print(listOfFirstDates)
+    #print(listOfLastDates)
+    for i in range (0, len(listOfFirstDates), 1):
+      date = listOfFirstDates[i]
+      if i == 0:
+        firstDate = date
+        yearMonthDay = firstDate.split('-')
+        firstYear = yearMonthDay[0]
+        firstMonth = yearMonthDay[1]
+        firstDay = yearMonthDay[2]
+      else:
+        yearMonthDay = date.split('-')
+        year = yearMonthDay[0]
+        month = yearMonthDay[1]
+        day = yearMonthDay[2]
+        if year < firstYear or (year == firstYear and month < firstMonth) or (year == firstYear and month == firstMonth and day < firstDay):
+          firstDate = date
+          firstYear = year
+          firstMonth = month
+          firstDay = day
+    #print(firstDate)
+    for i in range(0, len(listOfLastDates),1):
+      date = listOfLastDates[i]
+      if i == 0:
+        lastDate = date
+        yearMonthDay = lastDate.split('-')
+        lastYear = yearMonthDay[0]
+        lastMonth = yearMonthDay[1]
+        lastDay = yearMonthDay[2]
+      else:
+        yearMonthDay = date.split('-')
+        year = yearMonthDay[0]
+        month = yearMonthDay[1]
+        day = yearMonthDay[2]
+      if year > lastYear or (year == lastYear and month > lastMonth) or (year == lastYear and month == lastMonth and day > lastDay):
+        lastDate = date
+        lastYear = year
+        lastMonth = month
+        lastDay = day
+    #print(lastDate)
+    absFirstLastDates = []
+    absFirstLastDates.append(firstDate)
+    absFirstLastDates.append(lastDate)
+    return absFirstLastDates
+
+  def getFinalDatesAndClose(self):
+    # finalDates and finalClose will coincide (aka i = 1 will correspond to one another)
+    finalDatesAndClose = [] # Will combine finalDates then finalClose
+    finalDates = []
+    finalClose = []
+    #print(self.absFirstLastDates)
+    absFirstDate = self.absFirstLastDates[0]
+    absLastDate = self.absFirstLastDates[1]
+    date = absFirstDate
+
+    allLists = self.allLists
+    while date != absLastDate: # DOESN'T DO LAST DATE
+      tempListOfClose = []
+      found = False
+      for j in range(0, len(allLists), 1):      # Look for date in all lists
+        list1 = allLists[j]
+        listOfDates = list1[2]
+        listOfClose = list1[3]
+        for k in range(0, len(listOfDates), 1):
+          if listOfDates[k] == date:
+            if found == False:
+              finalDates.append(date)
+              found = True
+            #print(listOfDates[k])
+            #print(listOfClose[k])
+            #print(listOfClose)
+            tempListOfClose.append(float(listOfClose[k]))
+            k = len(listOfDates) # Dates don't repeat
+
+      if found == True:
+        sum = 0
+        for r in range(0, len(tempListOfClose), 1):
+          sum = sum + tempListOfClose[r]
+        close = sum/len(tempListOfClose)
+
+        finalClose.append(close)
+        #print(close)
+
+      # Go to the next day
+      yearMonthDay = date.split('-')
+      year = int(yearMonthDay[0])
+      month = int(yearMonthDay[1])
+      day = int(yearMonthDay[2])
+
+      day = day + 1
+      if day == 32 and month == 12: # Next year
+        day = 1
+        month = 2
+        year = year + 1
+      elif day == 32:              # Next month
+        month = month + 1
+        day = 1
+      if day < 10:
+        day = ''.join(('0', str(day)))
+      if month < 10:
+        month = ''.join(('0', str(month)))
+      date = ''.join((str(year), '-', str(month), '-', str(day)))
+      #print(date)
+
+    # For last date
+    finalDates.append(date)
+    tempListOfClose = []
+    for j in range(0, len(allLists), 1):      # Look for date in all lists
+      list1 = allLists[j]
+      listOfDates = list1[2]
+      listOfClose = list1[3]
+      for k in range(0, len(listOfDates), 1):
+        if listOfDates[k] == date:
+          tempListOfClose.append(float(listOfClose[k]))
+          k = len(listOfDates) # Dates don't repeat
+    sum = 0
+    for r in range(0, len(tempListOfClose), 1):
+      sum = sum + tempListOfClose[r]
+    close = sum/len(tempListOfClose)
+    finalClose.append(close)
+    #print(finalDates)
+    #print(finalClose)
+
+    # Want lists from most recent to oldest, comment this out if you don't want that
+    finalDates = list(reversed(finalDates))
+    finalClose = list(reversed(finalClose))    
+
+    finalDatesAndClose.append(finalDates)
+    finalDatesAndClose.append(finalClose)
+    return finalDatesAndClose
+
+  def main(self):
+
+    package_name = 'requests'
+    spec = importlib.util.find_spec(package_name)
+    if spec is None:
+      print(package_name +" is not installed\nPlease type in 'pip install -r requirements.txt' to install all required packages")
+
+    # Makes list with ['firstDate', 'lastDate', [allDates], values]
+
+    listOfFirstLastDates = []
+
+    # IEX
+    print("\nIEX")
+    listIEX = Stock.getIEX(self)
+    #print(listIEX)
+    listOfFirstLastDates.append((listIEX[0], listIEX[1]))
+    self.allLists.append(listIEX)
+
+    # Alpha Vantage
+    print("\nAlpha Vantage (AV)")
+    listAV = Stock.getAV(self)
+    #print(listAV)
+    listOfFirstLastDates.append((listAV[0], listAV[1]))
+    self.allLists.append(listAV)
+
+    # COMMENTED OUT FOR NOW B/C LIMITED TO 400 REQUESTS/DAY
+    '''
+    print("\nTiingo")
+    listTiingo = Stock.getTiingo(self)
+    #print(listTiingo)
+    listOfFirstLastDates.append((listTiingo[0], listTiingo[1]))
+    self.allLists.append(listTiingo)
+    '''
+
+    #print(self.allLists)
+    #print(listOfFirstLastDates)
+    self.absFirstLastDates = Stock.getFirstLastDate(self, listOfFirstLastDates)
+    print("\nThe absolute first date with close values is:", self.absFirstLastDates[0])
+    print("The absolute last date with close values is:", self.absFirstLastDates[1])
+
+    print("\nCombining dates and finding average close values")
+    self.finalDatesAndClose = Stock.getFinalDatesAndClose(self) # Returns [List of Dates, List of Corresponding Close Values]
+    #print("All dates available:", self.finalDatesAndClose[0])
+    #print("All close values:\n", self.finalDatesAndClose[1])
+    print("Uncomment above line in code to see output")
+
+def main(): # For testing purposes
+  stockName = 'aapl'
+  stock1 = Stock(stockName)
+  print("Finding available dates and close values for", stock1.name)
+  Stock.main(stock1)
+
+def imported(): # When this file has been imported
+  # Add stuff here
+  return
+
+if __name__ == "__main__":
+  main()
+
+else:
+  imported()
\ No newline at end of file
diff --git a/__pycache__/StockData.cpython-37.pyc b/__pycache__/StockData.cpython-37.pyc
deleted file mode 100644
index 92af2c9..0000000
Binary files a/__pycache__/StockData.cpython-37.pyc and /dev/null differ