diff --git a/dmrlink_SAMPLE.cfg b/dmrlink_SAMPLE.cfg
index 321fef5..22593a9 100644
--- a/dmrlink_SAMPLE.cfg
+++ b/dmrlink_SAMPLE.cfg
@@ -84,6 +84,7 @@ LOG_NAME: DMRlink
 # download again. Don't be an ass and change this to less than a few days.
 [ALIASES]
 TRY_DOWNLOAD: True
+LOCAL_FILE: False
 PATH: ./
 PEER_FILE: peer_ids.csv
 SUBSCRIBER_FILE: subscriber_ids.csv
diff --git a/ipsc/dmrlink_config.py b/ipsc/dmrlink_config.py
index 812c119..2e3067b 100755
--- a/ipsc/dmrlink_config.py
+++ b/ipsc/dmrlink_config.py
@@ -194,6 +194,7 @@ def build_config(_config_file):
                 CONFIG['SYSTEMS'][section]['LOCAL']['FLAGS'] = '\x00\x00'+chr(FLAG_1)+chr(FLAG_2)
     
     except ConfigParser.Error, err:
+        print(err)
         sys.exit('Could not parse configuration file, exiting...')
         
     return CONFIG
@@ -221,4 +222,4 @@ if __name__ == '__main__':
         cli_args.CONFIG_FILE = os.path.dirname(os.path.abspath(__file__))+'/dmrlink.cfg'
     
     
-    pprint(build_config(cli_args.CONFIG_FILE))
\ No newline at end of file
+    pprint(build_config(cli_args.CONFIG_FILE))
diff --git a/mk-dmrlink b/mk-dmrlink
index 4f451d5..16f869a 100755
--- a/mk-dmrlink
+++ b/mk-dmrlink
@@ -25,10 +25,6 @@ echo "Required programs installed, continuing"
 # You need multiple ipsc directories, dmrlink.py and dmrlink.cfg
 # The needed files are copied to /opt/dmrlink
 
-# Put scripts in /opt/dmrlink
-# cp /srv/DMRlink/get_ids.sh /opt/dmrlink # should be linked to /etc/cron.daily
-# cp /srv/DMRlink/init.d/bridge /opt/dmrlink/rc.bridge
-
 # Make needed directories
  mkdir -p /opt/dmrlink/ambe_audio/
  mkdir -p /opt/dmrlink/bridge/
@@ -36,18 +32,18 @@ echo "Required programs installed, continuing"
  mkdir -p /opt/dmrlink/log/
  mkdir -p /opt/dmrlink/playback/
  mkdir -p /opt/dmrlink/play_group/
- mkdir -p /opt/dmrlink/record/
+ mkdir -p /opt/dmrlink/proxy/
  mkdir -p /opt/dmrlink/rcm/
+ mkdir -p /opt/dmrlink/record/
  mkdir -p /opt/dmrlink/samples
  mkdir -p /var/log/dmrlink
 
 cd /opt/dmrlink
 
 # Put common files in /opt/dmrlink
-cp /srv/DMRlink/get_ids.sh /opt/dmrlink
-cp /srv/DMRlink/peer_ids.csv /opt/dmrlink
-cp /srv/DMRlink/subscriber_ids.csv /opt/dmrlink
-cp /srv/DMRlink/talkgroup_ids.csv /opt/dmrlink
+# cp /srv/DMRlink/peer_ids.csv /opt/dmrlink
+# cp /srv/DMRlink/subscriber_ids.csv /opt/dmrlink
+# cp /srv/DMRlink/talkgroup_ids.csv /opt/dmrlink
 
 # Copy ipsc directory into each app directory
 cp -rf /srv/DMRlink/ipsc/ /opt/dmrlink/ambe_audio/
@@ -56,8 +52,9 @@ cp -rf /srv/DMRlink/ipsc/ /opt/dmrlink/confbridge/
 cp -rf /srv/DMRlink/ipsc/ /opt/dmrlink/log/
 cp -rf /srv/DMRlink/ipsc/ /opt/dmrlink/playback/
 cp -rf /srv/DMRlink/ipsc/ /opt/dmrlink/play_group/
-cp -rf /srv/DMRlink/ipsc/ /opt/dmrlink/record/
+cp -rf /srv/DMRlink/ipsc/ /opt/dmrlink/proxy/
 cp -rf /srv/DMRlink/ipsc/ /opt/dmrlink/rcm/
+cp -rf /srv/DMRlink/ipsc/ /opt/dmrlink/record/
 
 # Put a copy of the samples together for easy reference
 cp /srv/DMRlink/bridge_rules_SAMPLE.py /opt/dmrlink/samples
@@ -76,9 +73,6 @@ cp /srv/DMRlink/ambe_audio_commands.txt /opt/dmrlink/documents
 
 # ambe_audio
 cp /srv/DMRlink/dmrlink.py /opt/dmrlink/ambe_audio/
-cp /srv/DMRlink/dmrlink_config.py /opt/dmrlink/ambe_audio/
-cp /srv/DMRlink/dmrlink_log.py /opt/dmrlink/ambe_audio/
-cp /srv/DMRlink/template.py /opt/dmrlink/ambe_audio/
 cp /srv/DMRlink/dmrlink_SAMPLE.cfg /opt/dmrlink/ambe_audio/
 #
 cp /srv/DMRlink/ambe_audio.cfg /opt/dmrlink/ambe_audio/
@@ -88,9 +82,6 @@ cp /srv/DMRlink/template.bin /opt/dmrlink/ambe_audio/
 
 # Bridge app
 cp /srv/DMRlink/dmrlink.py /opt/dmrlink/bridge/
-cp /srv/DMRlink/dmrlink_config.py /opt/dmrlink/bridge/
-cp /srv/DMRlink/dmrlink_log.py /opt/dmrlink/bridge/
-cp /srv/DMRlink/template.py /opt/dmrlink/bridge/
 cp /srv/DMRlink/dmrlink_SAMPLE.cfg /opt/dmrlink/bridge/
 #
 cp /srv/DMRlink/bridge.py /opt/dmrlink/bridge/
@@ -100,31 +91,21 @@ cp /srv/DMRlink/sub_acl_SAMPLE.py /opt/dmrlink/bridge/
 
 # ConfBridge app
 cp /srv/DMRlink/dmrlink.py /opt/dmrlink/confbridge/
-cp /srv/DMRlink/dmrlink_config.py /opt/dmrlink/confbridge/
-cp /srv/DMRlink/dmrlink_log.py /opt/dmrlink/confbridge/
-cp /srv/DMRlink/template.py /opt/dmrlink/confbridge/
 cp /srv/DMRlink/dmrlink_SAMPLE.cfg /opt/dmrlink/confbridge/
 #
 cp /srv/DMRlink/confbridge.py /opt/dmrlink/confbridge/
 cp /srv/DMRlink/confbridge_rules_SAMPLE.py /opt/dmrlink/confbridge/
-# Need these?
 cp /srv/DMRlink/known_bridges_SAMPLE.py /opt/dmrlink/confbridge/
 cp /srv/DMRlink/sub_acl_SAMPLE.py /opt/dmrlink/confbridge/
 
 # Log app
 cp /srv/DMRlink/dmrlink.py /opt/dmrlink/log/
-cp /srv/DMRlink/dmrlink_config.py /opt/dmrlink/log/
-cp /srv/DMRlink/dmrlink_log.py /opt/dmrlink/log/
-cp /srv/DMRlink/template.py /opt/dmrlink/log/
 cp /srv/DMRlink/dmrlink_SAMPLE.cfg /opt/dmrlink/log/
 #
 cp /srv/DMRlink/log.py /opt/dmrlink/log/
 
 # Playback (Parrot)
 cp /srv/DMRlink/dmrlink.py /opt/dmrlink/playback/
-cp /srv/DMRlink/dmrlink_config.py /opt/dmrlink/playback/
-cp /srv/DMRlink/dmrlink_log.py /opt/dmrlink/playback/
-cp /srv/DMRlink/template.py /opt/dmrlink/playback/
 cp /srv/DMRlink/dmrlink_SAMPLE.cfg /opt/dmrlink/playback/
 #
 cp /srv/DMRlink/playback.py /opt/dmrlink/playback/
@@ -132,31 +113,28 @@ cp /srv/DMRlink/playback_config_SAMPLE.py /opt/dmrlink/playback/
 
 # Play Group app
 cp /srv/DMRlink/dmrlink.py /opt/dmrlink/play_group/
-cp /srv/DMRlink/dmrlink_config.py /opt/dmrlink/play_group/
-cp /srv/DMRlink/dmrlink_log.py /opt/dmrlink/play_group/
-cp /srv/DMRlink/template.py /opt/dmrlink/play_group/
 cp /srv/DMRlink/dmrlink_SAMPLE.cfg /opt/dmrlink/play_group/
 #
 cp /srv/DMRlink/play_group.py /opt/dmrlink/play_group/
 
-# record app
-cp /srv/DMRlink/dmrlink.py /opt/dmrlink/record/
-cp /srv/DMRlink/dmrlink_config.py /opt/dmrlink/record/
-cp /srv/DMRlink/dmrlink_log.py /opt/dmrlink/record/
-cp /srv/DMRlink/template.py /opt/dmrlink/record/
-cp /srv/DMRlink/dmrlink_SAMPLE.cfg /opt/dmrlink/record/
+# proxy app
+cp /srv/DMRlink/dmrlink.py /opt/dmrlink/proxy/
+cp /srv/DMRlink/dmrlink_SAMPLE.cfg /opt/dmrlink/rcm/
 #
-cp /srv/DMRlink/record.py /opt/dmrlink/record/
+cp /srv/DMRlink/proxy.py /opt/dmrlink/proxy/
+cp /srv/DMRlink/known_bridges_SAMPLE.py /opt/dmrlink/proxy/
+cp /srv/DMRlink/sub_acl_SAMPLE.py /opt/dmrlink/proxy/
 
 # rcm app
 cp /srv/DMRlink/dmrlink.py /opt/dmrlink/rcm/
-cp /srv/DMRlink/dmrlink_config.py /opt/dmrlink/rcm/
-cp /srv/DMRlink/dmrlink_log.py /opt/dmrlink/rcm/
-cp /srv/DMRlink/template.py /opt/dmrlink/rcm/
 cp /srv/DMRlink/dmrlink_SAMPLE.cfg /opt/dmrlink/rcm/
 #
 cp /srv/DMRlink/rcm_db_log.py /opt/dmrlink/rcm/
 cp /srv/DMRlink/rcm.py /opt/dmrlink/rcm/
-cp /srv/DMRlink/pickle_stat_reader.py /opt/dmrlink/rcm/
 
+# record app
+cp /srv/DMRlink/dmrlink.py /opt/dmrlink/record/
+cp /srv/DMRlink/dmrlink_SAMPLE.cfg /opt/dmrlink/record/
+#
+cp /srv/DMRlink/record.py /opt/dmrlink/record/