diff --git a/dpmData.py b/dpmData.py
index de98c24..c182e8b 100644
--- a/dpmData.py
+++ b/dpmData.py
@@ -1,47 +1,99 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-"""
-Created on Mon Apr 20 11:43:17 2020
-
-@author: snag
-"""
+import argparse
+import datetime
+import sys
 import pandas as pd
 import DPM
 
-DEVICE_LIMIT = 0
-DEVICE_LIST = []
+def main():
+    parser = argparse.ArgumentParser()
+    #Add positional/optional parameters
+    parser.add_argument('-d', '--device_limit', help='Limit for number of devices. Default: 0. type=int', type=int, default=0)
+    parser.add_argument('-f', '--device_file', help='Filename containing the list of devices. Newline delimited. No default value. type=str', type=str)
+    parser.add_argument('-o', '--output_file', help='Name of the output file for the hdf5 file. Default: data.h5. type=str', default='data.h5', type=str)
+    parser.add_argument('-n', '--node', help='Name of the node. type=str', default=None, type=str)
+    #group 1
+
+    #Midnight to midnight currently.
+    parser.add_argument("-s", "--start_date", type=lambda s: datetime.datetime.strptime(s, '%Y-%m-%d'), help='Enter the start time/date. Do not use the duration tag. type=datetime.datetime', required=False)
+    parser.add_argument("-e", "--end_date", type=lambda s: datetime.datetime.strptime(s, '%Y-%m-%d'), help='Enter the end time/date. Do not use the duration tag. type=datetime.datetime', required=False)
+    #group 2
+    parser.add_argument("-du", "--duration", help="Enter LOGGERDURATION in sec. type=str", required=False, type=str)
+    #Parse the args
+    args = parser.parse_args()
+    sys.stdout.write(str(hdf_code(args)))
+
+def local_to_utc_ms(date):
+    utc_timezone = datetime.timezone(datetime.timedelta(0))
+    utc_datetime_obj = date.astimezone(utc_timezone)
+    time_in_ms = int(utc_datetime_obj.timestamp() * 1000)
+    return time_in_ms
 
-with open('DeviceList.csv') as f:
-    DEVICE_LIST = [line.rstrip() for index, line in enumerate(f)
-                   if index < DEVICE_LIMIT or DEVICE_LIMIT < 1]
+def hdf_code(args):
+    START_DATE = args.start_date
+    END_DATE = args.end_date
+    DURATION = args.duration
+    DEVICE_LIMIT = args.device_limit
+    DEVICE_FILE = args.device_file
+    OUTPUT_FILE = args.output_file
+    NODE = args.node
 
-dpm = DPM.Blocking()
-for index, device in enumerate(DEVICE_LIST):
-    dpm.add_entry(index, device)
+    request_string = ''     #Used later to provide input string for DPM
+    
+    if DURATION and (START_DATE or END_DATE):
+        print("-d and -s|-e are mutually exclusive! Exiting ...")
+        sys.exit(2)
 
-data_done = [None] * len(DEVICE_LIST)
+    elif START_DATE and END_DATE:
+        request_string = 'LOGGER:' + str(local_to_utc_ms(START_DATE)) + ':' + str(local_to_utc_ms(END_DATE))
+    
+    elif START_DATE and not END_DATE:
+        END_DATE = datetime.datetime.now()  #This is not midnight time
+        request_string = 'LOGGER:' + str(local_to_utc_ms(START_DATE)) + ':' + str(local_to_utc_ms(END_DATE))
 
-hdf = pd.HDFStore('data.h5')
-for event_response in dpm.process('LOGGERDURATION:360000'):
-    if hasattr(event_response, 'data'):
-        d = {'Timestamps' : event_response.micros, 'Data' : event_response.data}
-        df = pd.DataFrame(data=d)
-        hdf.append(DEVICE_LIST[event_response.tag], df)
+    elif END_DATE and not START_DATE:
+        print('Just entering end date is invalid. Please enter start date AND end date, or just start date.')
+        sys.exit(2)
+        
+    elif DURATION:
+        DURATION = int(DURATION) * 1000
+        request_string = 'LOGGERDURATION:' + str(DURATION)
 
-        if len(event_response.data) == 0:
-            data_done[event_response.tag] = True
+    if NODE:
+        request_string += ':' + NODE
+    
+    #The input is line separated devices.
+    DEVICE_LIST = []
+    with open(DEVICE_FILE) as f:
+        DEVICE_LIST = [line.rstrip() for index, line in enumerate(f)
+            if index < DEVICE_LIMIT or DEVICE_LIMIT < 1]
+    dpm = DPM.Blocking(None)     #Do not commit with 'DPMJ@VIRT01'
+    for index, device in enumerate(DEVICE_LIST):
+        dpm.add_entry(index, device)
 
-    #Status instead of actual data.
-    else:
-        #Want to make it status, but can't because of the bug
-        data_done[event_response.tag] = False
-        print(DEVICE_LIST[event_response.tag], event_response.status)
+    data_done = [None] * len(DEVICE_LIST)
+    hdf = pd.HDFStore(OUTPUT_FILE)
+    for event_response in dpm.process(request_string):
+        if hasattr(event_response, 'data'):
+            d = {'Timestamps' : event_response.micros, 'Data' : event_response.data}
+            df = pd.DataFrame(data=d)
+            hdf.append(DEVICE_LIST[event_response.tag], df)
+            if len(event_response.data) == 0:
+                data_done[event_response.tag] = True
+        #Status instead of actual data.
+        else:
+            #Want to make it status, but can't because of the bug
+            data_done[event_response.tag] = False
+            print(DEVICE_LIST[event_response.tag], event_response.status)
+        if data_done.count(None) == 0:
+            print(data_done)
+            break
 
-    if data_done.count(None) == 0:
-        print(data_done)
-        break
+    #READ THE HDF5 FILE
+    for k in list(hdf.keys()):
+        df = hdf[k]
+        print(k, ':\n', df)
 
-#READ THE HDF5 FILE
-for k in list(hdf.keys()):
-    df = hdf[k]
-    print(k, ':\n', df)
+if __name__ == '__main__':
+    main()