diff --git a/src/ATCDCL/ATCmgr.cxx b/src/ATCDCL/ATCmgr.cxx
index ec42f249d..df0927bda 100644
--- a/src/ATCDCL/ATCmgr.cxx
+++ b/src/ATCDCL/ATCmgr.cxx
@@ -31,7 +31,6 @@
 #include "commlist.hxx"
 #include "ATCDialog.hxx"
 #include "ATCutils.hxx"
-#include "ground.hxx"
 
 
 /*
@@ -44,13 +43,7 @@ static void fgATCSearch( void ) {
 
 AirportATC::AirportATC() :
     atis_freq(0.0),
-    atis_active(false),
-    tower_freq(0.0),
-    tower_active(false),
-    ground_freq(0.0),
-    ground_active(false),
-    set_by_AI(false),
-    numAI(0)
+    atis_active(false)
     //airport_atc_map.clear();
 {
 }
@@ -123,17 +116,18 @@ void FGATCMgr::update(double dt) {
         }
         //cout << "Updating " << (*atc_list_itr)->get_ident() << ' ' << (*atc_list_itr)->GetType() << '\n';
         //cout << "Freq = " << (*atc_list_itr)->get_freq() << '\n';
+        //cout << "Updating...\n";
         (*atc_list_itr).second->Update(dt * atc_list->size());
         //cout << "Done ATC update..." << endl;
         ++atc_list_itr;
     }
     
 #ifdef ATC_TEST
-    cout << "ATC_LIST: " << atc_list->size() << ' ';
+    //cout << "ATC_LIST: " << atc_list->size() << ' ';
     for(atc_list_iterator it = atc_list->begin(); it != atc_list->end(); it++) {
         cout << (*it)->get_ident() << ' ';
     }
-    cout << '\n';
+    //cout << '\n';
 #endif
     
     // Search the tuned frequencies every now and then - this should be done with the event scheduler
@@ -169,17 +163,9 @@ bool FGATCMgr::CommRegisterAirport(const string& ident, int chan, const atc_type
     SG_LOG(SG_ATC, SG_BULK, "Comm channel " << chan << " registered airport " << ident);
     //cout << "Comm channel " << chan << " registered airport " << ident << ' ' << tp << '\n';
     if(airport_atc_map.find(ident) != airport_atc_map.end()) {
-        //cout << "IN MAP - flagging set by comm..." << endl;
-//xx        airport_atc_map[ident]->set_by_comm[chan][tp] = true;
         if(tp == ATIS || tp == AWOS) {
             airport_atc_map[ident]->atis_active = true;
-        } else if(tp == TOWER) {
-            airport_atc_map[ident]->tower_active = true;
-        } else if(tp == GROUND) {
-            airport_atc_map[ident]->ground_active = true;
-        } else if(tp == APPROACH) {
-            //a->approach_active = true;
-        }   // TODO - there *must* be a better way to do this!!!
+        }
         return(true);
     } else {
         //cout << "NOT IN MAP - creating new..." << endl;
@@ -191,23 +177,9 @@ bool FGATCMgr::CommRegisterAirport(const string& ident, int chan, const atc_type
             a->atis_freq = GetFrequency(ident, ATIS)
                     || GetFrequency(ident, AWOS);
             a->atis_active = false;
-            a->tower_freq = GetFrequency(ident, TOWER);
-            a->tower_active = false;
-            a->ground_freq = GetFrequency(ident, GROUND);
-            a->ground_active = false;
             if(tp == ATIS || tp == AWOS) {
                 a->atis_active = true;
-            } else if(tp == TOWER) {
-                a->tower_active = true;
-            } else if(tp == GROUND) {
-                a->ground_active = true;
-            } else if(tp == APPROACH) {
-                //a->approach_active = true;
-            }   // TODO - there *must* be a better way to do this!!!
-            // TODO - some airports will have a tower/ground frequency but be inactive overnight.
-            a->set_by_AI = false;
-            a->numAI = 0;
-//xx            a->set_by_comm[chan][tp] = true;
+            }
             airport_atc_map[ident] = a;
             return(true);
         }
@@ -225,26 +197,25 @@ void FGATCMgr::ZapOtherService(const string ncunit, const string svc_name){
       // OK, we have found some OTHER service;
       // see if it is (was) active on our unit:
       if (!actv.count(ncunit)) continue;
-      // cout << "Eradicating '" << svc->first << "' from: " << ncunit << endl;
+      //cout << "Eradicating '" << svc->first << "' from: " << ncunit << endl;
       actv.erase(ncunit);
       if (!actv.size()) {
         //cout << "Eradicating service: '" << svc->first << "'" << endl;
-    svc->second->SetNoDisplay();
-    svc->second->Update(0);     // one last update
-    SG_LOG(SG_GENERAL, SG_INFO, "would have erased ATC service:" << svc->second->get_name()<< "/" 
-      << svc->second->get_ident());
-   // delete svc->second;
-    atc_list->erase(svc);
-// ALL pointers into the ATC list are now invalid,
-// so let's reset them:
-    atc_list_itr = atc_list->begin();
+        svc->second->SetNoDisplay();
+        svc->second->Update(0);     // one last update
+        SG_LOG(SG_GENERAL, SG_INFO, "would have erased ATC service:" << svc->second->get_name()<< "/"
+          << svc->second->get_ident());
+        // delete svc->second;
+        atc_list->erase(svc);
+        // ALL pointers into the ATC list are now invalid,
+        // so let's reset them:
+        atc_list_itr = atc_list->begin();
       }
       break;        // cannot be duplicates in the active list
     }
   }
 }
 
-
 // Find in list - return a currently active ATC pointer given ICAO code and type
 // Return NULL if the given service is not in the list
 // - *** THE CALLING FUNCTION MUST CHECK FOR THIS ***
@@ -264,81 +235,6 @@ bool FGATCMgr::GetAirportATCDetails(const string& icao, AirportATC* a) {
     }
 }
 
-
-// Return a pointer to a given sort of ATC at a given airport and activate if necessary
-// Returns NULL if service doesn't exist - calling function should check for this.
-// We really ought to make this private and call it from the CommRegisterAirport / AIRegisterAirport functions
-// - at the moment all these GetATC... functions exposed are just too complicated.
-FGATC* FGATCMgr::GetATCPointer(const string& icao, const atc_type& type) {
-    if(airport_atc_map.find(icao) == airport_atc_map.end()) {
-        //cout << "Unable to find " << icao << ' ' << type << " in the airport_atc_map" << endl;
-        return NULL;
-    }
-    //cout << "In GetATCPointer, found " << icao << ' ' << type << endl;
-    AirportATC *a = airport_atc_map[icao];
-    //cout << "a->lon = " << a->lon << '\n';
-    //cout << "a->elev = " << a->elev << '\n';
-    //cout << "a->tower_freq = " << a->tower_freq << '\n';
-    switch(type) {
-    case TOWER:
-        if(a->tower_active) {
-            // Get the pointer from the list
-            return(FindInList(icao, type));
-        } else {
-            ATCData data;
-            if(current_commlist->FindByFreq(a->geod, a->tower_freq, &data, TOWER)) {
-                FGTower* t = new FGTower;
-                t->SetData(&data);
-                (*atc_list)[icao+decimalNumeral(type)] = t;
-                a->tower_active = true;
-                airport_atc_map[icao] = a;
-                //cout << "Initing tower " << icao << " in GetATCPointer()\n";
-                t->Init();
-                return(t);
-            } else {
-                SG_LOG(SG_ATC, SG_ALERT, "ERROR - tower that should exist in FGATCMgr::GetATCPointer for airport " << icao << " not found");
-            }
-        }
-        break;
-    case APPROACH:
-        break;
-    case ATIS: case AWOS:
-        SG_LOG(SG_ATC, SG_ALERT, "ERROR - ATIS station should not be requested from FGATCMgr::GetATCPointer");
-        break;
-    case GROUND:
-        //cout << "IN CASE GROUND" << endl;
-        if(a->ground_active) {
-            // Get the pointer from the list
-            return(FindInList(icao, type));
-        } else {
-            ATCData data;
-            if(current_commlist->FindByFreq(a->geod, a->ground_freq, &data, GROUND)) {
-                FGGround* g = new FGGround;
-                g->SetData(&data);
-                (*atc_list)[icao+decimalNumeral(type)] = g;
-                a->ground_active = true;
-                airport_atc_map[icao] = a;
-                g->Init();
-                return(g);
-            } else {
-                SG_LOG(SG_ATC, SG_ALERT, "ERROR - ground control that should exist in FGATCMgr::GetATCPointer for airport " << icao << " not found");
-            }
-        }
-        break;
-        case INVALID:
-        break;
-        case ENROUTE:
-        break;
-        case DEPARTURE:
-        break;
-    }
-    
-    SG_LOG(SG_ATC, SG_ALERT, "ERROR IN FGATCMgr - reached end of GetATCPointer");
-    //cout << "ERROR IN FGATCMgr - reached end of GetATCPointer" << endl;
-    
-    return(NULL);
-}
-
 // Return a pointer to an appropriate voice for a given type of ATC
 // creating the voice if necessary - ie. make sure exactly one copy
 // of every voice in use exists in memory.
@@ -398,10 +294,10 @@ FGATCVoice* FGATCMgr::GetVoicePointer(const atc_type& type) {
 void FGATCMgr::FreqSearch(const string navcomm, const int unit) {
 
 
-        string ncunit = navcomm + "[" + decimalNumeral(unit) + "]";
+    string ncunit = navcomm + "[" + decimalNumeral(unit) + "]";
     string commbase = "/instrumentation/" + ncunit;
     string commfreq = commbase + "/frequencies/selected-mhz";
-        SGPropertyNode_ptr comm_node = fgGetNode(commfreq.c_str(), false);
+    SGPropertyNode_ptr comm_node = fgGetNode(commfreq.c_str(), false);
 
     //cout << "FreqSearch: " << ncunit
     //  << "  node: " << comm_node << endl;
@@ -410,48 +306,47 @@ void FGATCMgr::FreqSearch(const string navcomm, const int unit) {
     ATCData data;   
     double freq = comm_node->getDoubleValue();
     _aircraftPos = SGGeod::fromDegFt(lon_node->getDoubleValue(),
-      lat_node->getDoubleValue(), elev_node->getDoubleValue());
+        lat_node->getDoubleValue(), elev_node->getDoubleValue());
     
-// Query the data store and get the closest match if any
+    // Query the data store and get the closest match if any
     //cout << "Will FindByFreq: " << lat << " " << lon << " " << elev
     //      << "  freq: " << freq << endl;
     if(current_commlist->FindByFreq(_aircraftPos, freq, &data)) {
-      //cout << "FoundByFreq: " << freq 
-      //  << "  ident: " << data.ident 
-      //  << "  type: " << data.type << " ***" << endl;
-// We are in range of something.
+        //cout << "FoundByFreq: " << freq
+        //  << "  ident: " << data.ident
+        //  << "  type: " << data.type << " ***" << endl;
+        // We are in range of something.
 
 
-// Get rid of any *other* service that was on this radio unit:
-            string svc_name = data.ident+decimalNumeral(data.type);
+        // Get rid of any *other* service that was on this radio unit:
+        string svc_name = data.ident+decimalNumeral(data.type);
         ZapOtherService(ncunit, svc_name);
-// See if the service already exists, possibly connected to
-// some other radio unit:
+        // See if the service already exists, possibly connected to
+        // some other radio unit:
         if (atc_list->count(svc_name)) {
-          // make sure the service knows it's tuned on this radio:
-          FGATC* svc = (*atc_list)[svc_name];
-          svc->active_on[ncunit] = 1;
-          svc->SetDisplay();
-          if (data.type == APPROACH) svc->AddPlane("Player");
-          return;
+            // make sure the service knows it's tuned on this radio:
+            FGATC* svc = (*atc_list)[svc_name];
+            svc->active_on[ncunit] = 1;
+            svc->SetDisplay();
+            return;
         }
 
         CommRegisterAirport(data.ident, unit, data.type);
 
-// This was a switch-case statement but the compiler didn't like 
-// the new variable creation with it. 
-        if      (data.type == ATIS
-              || data.type == AWOS)     (*atc_list)[svc_name] = new FGATIS;
-        else if (data.type == TOWER)    (*atc_list)[svc_name] = new FGTower;
-        else if (data.type == GROUND)   (*atc_list)[svc_name] = new FGGround;
-        FGATC* svc = (*atc_list)[svc_name];
-        svc->SetData(&data);
-        svc->active_on[ncunit] = 1;
-        svc->SetDisplay();
-        svc->Init();
-        if (data.type == APPROACH) svc->AddPlane("Player");
+        // This was a switch-case statement but the compiler didn't like
+        // the new variable creation with it.
+        if(data.type == ATIS || data.type == AWOS) {
+            (*atc_list)[svc_name] = new FGATIS;
+            FGATC* svc = (*atc_list)[svc_name];
+            if(svc != NULL) {
+                svc->SetData(&data);
+                svc->active_on[ncunit] = 1;
+                svc->SetDisplay();
+                svc->Init();
+            }
+        }
     } else {
-      // No services in range.  Zap any service on this unit.
-      ZapOtherService(ncunit, "x x x");
+        // No services in range.  Zap any service on this unit.
+        ZapOtherService(ncunit, "x x x");
     } 
 }
diff --git a/src/ATCDCL/ATCmgr.hxx b/src/ATCDCL/ATCmgr.hxx
index 29601b826..532ecb3b2 100644
--- a/src/ATCDCL/ATCmgr.hxx
+++ b/src/ATCDCL/ATCmgr.hxx
@@ -31,7 +31,7 @@
 #include <list>
 #include <map>
 
-#include "tower.hxx"
+#include "ATC.hxx"
 
 using std::string;
 using std::list;
@@ -47,22 +47,6 @@ struct AirportATC {
     SGGeod geod;
     float atis_freq;
     bool atis_active;
-    float tower_freq;
-    bool tower_active;
-    float ground_freq;
-    bool ground_active;
-    //float approach_freq;
-    //bool approach_active;
-    //float departure_freq;
-    //bool departure_active;
-	
-	// NOTE - the *_active flags determine whether the service is active in atc_list,
-	// *NOT* whether the tower etc is closed or not!!!!
-
-    // Flags to ensure the stations don't get wrongly deactivated
-    bool set_by_AI;	// true when the AI manager has activated this station
-	unsigned int numAI;	// Ref count of the number of AI planes registered
-//xx    bool set_by_comm[2][ATC_NUM_TYPES];	// true when the relevant comm_freq has activated this station and type
 };
 
 class FGATCMgr : public SGSubsystem
@@ -70,7 +54,7 @@ class FGATCMgr : public SGSubsystem
 
 private:
 
-	bool initDone;	// Hack - guard against update getting called before init
+    bool initDone;	// Hack - guard against update getting called before init
 
     // A map of airport ID vs frequencies and ATC provision
     typedef map < string, AirportATC* > airport_atc_map_type;
@@ -105,14 +89,12 @@ private:
     bool last_in_range;
 
     //FGATIS atis;
-    //FGGround ground;
-    FGTower tower;
 	
-	// Voice related stuff
-	bool voice;			// Flag - true if we are using voice
+    // Voice related stuff
+    bool voice;			// Flag - true if we are using voice
 #ifdef ENABLE_AUDIO_SUPPORT
-	bool voiceOK;		// Flag - true if at least one voice has loaded OK
-	FGATCVoice* v1;
+    bool voiceOK;		// Flag - true if at least one voice has loaded OK
+    FGATCVoice* v1;
 #endif
 
 public:
@@ -130,31 +112,27 @@ public:
 
     // Returns true if the airport is found in the map
     bool GetAirportATCDetails(const string& icao, AirportATC* a);
-
-    // Return a pointer to a given sort of ATC at a given airport and activate if necessary
-	// Returns NULL if service doesn't exist - calling function should check for this.
-    FGATC* GetATCPointer(const string& icao, const atc_type& type);
 	
-	// Return a pointer to an appropriate voice for a given type of ATC
-	// creating the voice if necessary - ie. make sure exactly one copy
-	// of every voice in use exists in memory.
-	//
-	// TODO - in the future this will get more complex and dole out country/airport
-	// specific voices, and possible make sure that the same voice doesn't get used
-	// at different airports in quick succession if a large enough selection are available.
-	FGATCVoice* GetVoicePointer(const atc_type& type);
-	
-	atc_type GetComm1ATCType() { return(INVALID/* kludge */); }
-	FGATC* GetComm1ATCPointer() { return(0/* kludge */); }
-	atc_type GetComm2ATCType() { return(INVALID); }
-	FGATC* GetComm2ATCPointer() { return(0/* kludge */); }
-	
-	// Get the frequency of a given service at a given airport
-	// Returns zero if not found
-	unsigned short int GetFrequency(const string& ident, const atc_type& tp);
-	
-	// Register the fact that the comm radio is tuned to an airport
-	bool CommRegisterAirport(const string& ident, int chan, const atc_type& tp);
+    // Return a pointer to an appropriate voice for a given type of ATC
+    // creating the voice if necessary - ie. make sure exactly one copy
+    // of every voice in use exists in memory.
+    //
+    // TODO - in the future this will get more complex and dole out country/airport
+    // specific voices, and possible make sure that the same voice doesn't get used
+    // at different airports in quick succession if a large enough selection are available.
+    FGATCVoice* GetVoicePointer(const atc_type& type);
+    
+    atc_type GetComm1ATCType() { return(INVALID/* kludge */); }
+    FGATC* GetComm1ATCPointer() { return(0/* kludge */); }
+    atc_type GetComm2ATCType() { return(INVALID); }
+    FGATC* GetComm2ATCPointer() { return(0/* kludge */); }
+    
+    // Get the frequency of a given service at a given airport
+    // Returns zero if not found
+    unsigned short int GetFrequency(const string& ident, const atc_type& tp);
+    
+    // Register the fact that the comm radio is tuned to an airport
+    bool CommRegisterAirport(const string& ident, int chan, const atc_type& tp);
 	
 private:
 
@@ -163,9 +141,8 @@ private:
     void ZapOtherService(const string ncunit, const string svc_name);
 
     // Return a pointer to a class in the list given ICAO code and type
-	// (external interface to this is through GetATCPointer) 
-	// Return NULL if the given service is not in the list
-	// - *** THE CALLING FUNCTION MUST CHECK FOR THIS ***
+    // Return NULL if the given service is not in the list
+    // - *** THE CALLING FUNCTION MUST CHECK FOR THIS ***
     FGATC* FindInList(const string& id, const atc_type& tp);
 
     // Search the specified radio for stations on the same frequency and in range.
diff --git a/src/ATCDCL/Makefile.am b/src/ATCDCL/Makefile.am
index 28999cd7e..d268da1e5 100644
--- a/src/ATCDCL/Makefile.am
+++ b/src/ATCDCL/Makefile.am
@@ -3,8 +3,6 @@ noinst_LIBRARIES = libATCDCL.a
 libATCDCL_a_SOURCES = \
 	ATC.hxx ATC.cxx \
 	atis.hxx atis.cxx \
-	tower.hxx tower.cxx \
-	ground.hxx ground.cxx \
 	commlist.hxx commlist.cxx \
 	ATCDialog.hxx ATCDialog.cxx \
 	ATCVoice.hxx ATCVoice.cxx \
diff --git a/src/ATCDCL/ground.cxx b/src/ATCDCL/ground.cxx
deleted file mode 100644
index f345852b0..000000000
--- a/src/ATCDCL/ground.cxx
+++ /dev/null
@@ -1,600 +0,0 @@
-// FGGround - a class to provide ground control at larger airports.
-//
-// Written by David Luff, started March 2002.
-//
-// Copyright (C) 2002  David C. Luff - david.luff@nottingham.ac.uk
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <iostream>
-
-#include <simgear/misc/sg_path.hxx>
-#include <simgear/math/sg_random.h>
-#include <simgear/debug/logstream.hxx>
-#include <simgear/misc/sgstream.hxx>
-#include <simgear/constants.h>
-#include <Main/globals.hxx>
-
-#include <stdlib.h>
-#include <fstream>
-
-#include "ground.hxx"
-#include "ATCutils.hxx"
-#include "ATCmgr.hxx"
-
-using std::ifstream;
-using std::cout;
-
-node::node() {
-}
-
-node::~node() {
-	for(unsigned int i=0; i < arcs.size(); ++i) {
-		delete arcs[i];
-	}
-}
-
-// Make sure that a_path.cost += distance is safe from the moment it's created.
-a_path::a_path() {
-	cost = 0;
-}
-
-FGGround::FGGround() {
-	ATCmgr = globals->get_ATC_mgr();
-	_type = GROUND;
-	networkLoadOK = false;
-	ground_traffic.erase(ground_traffic.begin(), ground_traffic.end());
-	ground_traffic_itr = ground_traffic.begin();
-	
-	// Init the property nodes - TODO - need to make sure we're getting surface winds.
-	wind_from_hdg = fgGetNode("/environment/wind-from-heading-deg", true);
-	wind_speed_knots = fgGetNode("/environment/wind-speed-kt", true);
-	
-	// TODO - get the actual airport elevation
-	aptElev = 0.0;
-}
-
-FGGround::FGGround(const string& id) {
-	ATCmgr = globals->get_ATC_mgr();
-	networkLoadOK = false;
-	ground_traffic.erase(ground_traffic.begin(), ground_traffic.end());
-	ground_traffic_itr = ground_traffic.begin();
-	ident = id;
-	
-	// Init the property nodes - TODO - need to make sure we're getting surface winds.
-	wind_from_hdg = fgGetNode("/environment/wind-from-heading-deg", true);
-	wind_speed_knots = fgGetNode("/environment/wind-speed-kt", true);
-	
-	// TODO - get the actual airport elevation
-	aptElev = 0.0;
-}
-
-FGGround::~FGGround() {
-}
-
-void FGGround::ParseRwyExits(node* np, char* es) {
-	char* token;
-	char estr[20];
-	strcpy(estr, es);
-	const char delimiters[] = "-";
-	token = strtok(estr, delimiters);
-	while(token != NULL) {
-		int i = atoi(token);
-		//cout << "token = " << token << endl;
-		//cout << "rwy number = " << i << endl;
-		//runways[(atoi(token))].exits.push_back(np);
-		runways[i].exits.push_back(np);
-		//cout << "token = " << token << '\n';
-		token = strtok(NULL, delimiters);
-	}
-}
-	
-
-// Load the ground logical network of the current instances airport
-// Return true if successfull.
-// TODO - currently the file is assumed to reside in the base/ATC directory.
-// This might change to something more thought out in the future.
-// NOTE - currently it is assumed that all nodes are loaded before any arcs.
-// It won't work ATM if this doesn't hold true.
-bool FGGround::LoadNetwork() {
-	node* np;
-	arc* ap;
-	Gate* gp;
-	
-	int gateCount = 0;	// This is used to allocate gateID's from zero upwards
-	// This may well change in the future - probably to reading in the real-world
-	// gate numbers from file.
-	
-	ifstream fin;
-	SGPath path = globals->get_fg_root();
-	//string taxiPath = "ATC/" + ident + ".taxi";
-	string taxiPath = "ATC/KEMT.taxi";	// FIXME - HARDWIRED FOR TESTING
-	path.append(taxiPath);
-	
-	SG_LOG(SG_ATC, SG_INFO, "Trying to read taxiway data for " << ident << "...");
-	//cout << "Trying to read taxiway data for " << ident << "..." << endl;
-	fin.open(path.c_str(), ios::in);
-	if(!fin) {
-		SG_LOG(SG_ATC, SG_ALERT, "Unable to open taxiway data input file " << path.c_str());
-		//cout << "Unable to open taxiway data input file " << path.c_str() << endl;
-		return(false);
-	}
-	
-	char ch;
-	char buf[30];
-	while(!fin.eof()) {
-		fin >> buf;
-		// Node, arc, or [End]?
-		//cout << "Read in ground network element type = " << buf << endl;
-		if(!strcmp(buf, "[End]")) {		// TODO - maybe make this more robust to spelling errors by just looking for '['
-			SG_LOG(SG_ATC, SG_INFO, "Done reading " << path.c_str() << endl);
-			break;
-		} else if(!strcmp(buf, "N")) {
-			// Node
-			np = new node;
-			np->struct_type = NODE;
-			fin >> buf;
-			np->nodeID = atoi(buf);
-			fin >> buf;
-			np->pos.setLongitudeDeg(atof(buf));
-			fin >> buf;
-			np->pos.setLatitudeDeg(atof(buf));
-			fin >> buf;
-			np->pos.setElevationM(atof(buf));
-			fin >> buf;		// node type
-			if(!strcmp(buf, "J")) {
-				np->type = JUNCTION;
-			} else if(!strcmp(buf, "T")) {
-				np->type = TJUNCTION;
-			} else if(!strcmp(buf, "H")) {
-				np->type = HOLD;
-			} else {
-				SG_LOG(SG_ATC, SG_ALERT, "**** ERROR ***** Unknown node type in taxi network...\n");
-				delete np;
-				return(false);
-			}
-			fin >> buf;		// rwy exit information - gets parsed later - FRAGILE - will break if buf is reused.
-			// Now the name
-			fin >> ch;	// strip the leading " off
-			np->name = "";
-			while(1) {
-				fin.unsetf(ios::skipws);
-				fin >> ch;
-				if((ch == '"') || (ch == 0x0A)) {
-					break;
-				}   // we shouldn't need the 0x0A but it makes a nice safely in case someone leaves off the "
-				np->name += ch;
-			}
-			fin.setf(ios::skipws);
-			network.push_back(np);
-			// FIXME - fragile - replies on buf not getting modified from exits read to here
-			// see if we also need to push it onto the runway exit list
-			//cout << "strlen(buf) = " << strlen(buf) << endl;
-			if(strlen(buf) > 2) {
-				//cout << "Calling ParseRwyExits for " << buf << endl;
-				ParseRwyExits(np, buf);
-			}
-		} else if(!strcmp(buf, "A")) {
-			ap = new arc;
-			ap->struct_type = ARC;
-			fin >> buf;
-			ap->n1 = atoi(buf);
-			fin >> buf;
-			ap->n2 = atoi(buf);
-			fin >> buf;
-			if(!strcmp(buf, "R")) {
-				ap->type = RUNWAY;
-			} else if(!strcmp(buf, "T")) {
-				ap->type = TAXIWAY;
-			} else {
-				SG_LOG(SG_ATC, SG_ALERT, "**** ERROR ***** Unknown arc type in taxi network...\n");
-				delete ap;
-				return(false);
-			}
-			// directed?
-			fin >> buf;
-			if(!strcmp(buf, "Y")) {
-				ap->directed = true;
-			} else if(!strcmp(buf, "N")) {
-				ap->directed = false;
-			} else {
-				SG_LOG(SG_ATC, SG_ALERT, "**** ERROR ***** Unknown arc directed value in taxi network - should be Y/N !!!\n");
-				delete ap;
-				return(false);
-			}			
-			// Now the name
-			ap->name = "";
-			while(1) {
-				fin.unsetf(ios::skipws);
-				fin >> ch;
-				ap->name += ch;
-				if((ch == '"') || (ch == 0x0A)) {
-					break;
-				}   // we shouldn't need the 0x0A but it makes a nice safely in case someone leaves off the "
-			}
-			fin.setf(ios::skipws);
-			ap->distance = (int)dclGetHorizontalSeparation(network[ap->n1]->pos, network[ap->n2]->pos);
-			//cout << "Distance  = " << ap->distance << '\n';
-			network[ap->n1]->arcs.push_back(ap);
-			network[ap->n2]->arcs.push_back(ap);
-		} else if(!strcmp(buf, "G")) {
-			gp = new Gate;
-			gp->struct_type = NODE;
-			gp->type = GATE;
-			fin >> buf;
-			gp->nodeID = atoi(buf);
-			fin >> buf;
-			gp->pos.setLongitudeDeg(atof(buf));
-			fin >> buf;
-			gp->pos.setLatitudeDeg(atof(buf));
-			fin >> buf;
-			gp->pos.setElevationM(atof(buf));
-			fin >> buf;		// gate type - ignore this for now
-			fin >> buf;		// gate heading
-			gp->heading = atoi(buf);
-			// Now the name
-			gp->name = "";
-			while(1) {
-				fin.unsetf(ios::skipws);
-				fin >> ch;
-				gp->name += ch;
-				if((ch == '"') || (ch == 0x0A)) {
-					break;
-				}   // we shouldn't need the 0x0A but it makes a nice safely in case someone leaves off the "
-			}
-			fin.setf(ios::skipws);
-			gp->id = gateCount;		// Warning - this will likely change in the future.
-			gp->used = false;
-			network.push_back(gp);
-			gates[gateCount] = gp;
-			gateCount++;
-		} else {
-			// Something has gone seriously pear-shaped
-			SG_LOG(SG_ATC, SG_ALERT, "********* ERROR - unknown ground network element type... aborting read of " << path.c_str() << '\n');
-			return(false);
-		}
-		
-		fin >> skipeol;		
-	}
-	return(true);
-}
-
-void FGGround::Init() {
-	untowered = false;
-	
-	// Figure out which is the active runway - TODO - it would be better to have ground call tower
-	// for runway operation details, but at the moment we can't guarantee that tower control at a given airport
-	// will be initialised before ground so we can't do that.
-	DoRwyDetails();
-	//cout << "In FGGround::Init, active rwy is " << activeRwy << '\n';
-	ortho.Init(rwy.threshold_pos, rwy.hdg);
-
-	networkLoadOK = LoadNetwork();
-}
-
-void FGGround::Update(double dt) {
-	
-	// Call the base class update for the response time handling.
-	FGATC::Update(dt);
-}
-
-// Figure out which runways are active.
-// For now we'll just be simple and do one active runway - eventually this will get much more complex
-// Copied from FGTower - TODO - it would be better to implement this just once, and have ground call tower
-// for runway operation details, but at the moment we can't guarantee that tower control at a given airport
-// will be initialised before ground so we can't do that.
-void FGGround::DoRwyDetails() {
-	//cout << "GetRwyDetails called" << endl;
-		
-  const FGAirport* apt = fgFindAirportID(ident);
-  if (!apt) {
-    SG_LOG(SG_ATC, SG_WARN, "FGGround::DoRwyDetails: unknown ICAO:" << ident);
-    return;
-  }
-  
-	FGRunway* runway = apt->getActiveRunwayForUsage();
-
-  activeRwy = runway->ident();
-  rwy.rwyID = runway->ident();
-  SG_LOG(SG_ATC, SG_INFO, "In FGGround, active runway for airport " << ident << " is " << activeRwy);
-  
-  // Get the threshold position
-  double other_way = runway->headingDeg() - 180.0;
-  while(other_way <= 0.0) {
-    other_way += 360.0;
-  }
-    // move to the +l end/center of the runway
-  //cout << "Runway center is at " << runway._lon << ", " << runway._lat << '\n';
-  double tshlon = 0.0, tshlat = 0.0, tshr = 0.0;
-  double tolon = 0.0, tolat = 0.0, tor = 0.0;
-  rwy.length = runway->lengthM();
-  geo_direct_wgs_84 ( aptElev, runway->latitude(), runway->longitude(), other_way, 
-                      rwy.length / 2.0 - 25.0, &tshlat, &tshlon, &tshr );
-  geo_direct_wgs_84 ( aptElev, runway->latitude(), runway->longitude(), runway->headingDeg(), 
-                      rwy.length / 2.0 - 25.0, &tolat, &tolon, &tor );
-  // Note - 25 meters in from the runway end is a bit of a hack to put the plane ahead of the user.
-  // now copy what we need out of runway into rwy
-  rwy.threshold_pos = SGGeod::fromDegM(tshlon, tshlat, aptElev);
-  SGGeod takeoff_end = SGGeod::fromDegM(tolon, tolat, aptElev);
-  //cout << "Threshold position = " << tshlon << ", " << tshlat << ", " << aptElev << '\n';
-  //cout << "Takeoff position = " << tolon << ", " << tolat << ", " << aptElev << '\n';
-  rwy.hdg = runway->headingDeg();
-  // Set the projection for the local area based on this active runway
-  ortho.Init(rwy.threshold_pos, rwy.hdg);	
-  rwy.end1ortho = ortho.ConvertToLocal(rwy.threshold_pos);	// should come out as zero
-  rwy.end2ortho = ortho.ConvertToLocal(takeoff_end);
-}
-
-// Return a random gate ID of an unused gate.
-// Two error values may be returned and must be checked for by the calling function:
-// -2 signifies that no gates exist at this airport.
-// -1 signifies that all gates are currently full.
-int FGGround::GetRandomGateID() {
-	// Check that this airport actually has some gates!!
-	if(!gates.size()) {
-		return(-2);
-	}
-
-	gate_vec_type gateVec;
-	int num = 0;
-	int thenum;
-	int ID;
-	
-	gatesItr = gates.begin();
-	while(gatesItr != gates.end()) {
-		if((gatesItr->second)->used == false) {
-			gateVec.push_back(gatesItr->second);
-			num++;
-		}
-		++gatesItr;
-	}
-
-	// Check that there are some unused gates!
-	if(!gateVec.size()) {
-		return(-1);
-	}
-	
-	// Randomly select one from the list
-	sg_srandom_time();
-	thenum = (int)(sg_random() * gateVec.size());
-	ID = gateVec[thenum]->id;
-	
-	return(ID);
-}
-
-// Return a pointer to an unused gate node
-Gate* FGGround::GetGateNode() {
-	int id = GetRandomGateID();
-	if(id < 0) {
-		return(NULL);
-	} else {
-		return(gates[id]);
-	}
-}
-
-
-node* FGGround::GetHoldShortNode(const string& rwyID) {
-	return(NULL);	// TODO - either implement me or remove me!!!
-}
-
-
-// WARNING - This is hardwired to my prototype logical network format
-// and will almost certainly change when Bernie's stuff comes on-line.
-// Returns NULL if it can't find a valid node.
-node* FGGround::GetThresholdNode(const string& rwyID) {
-	// For now go through all the nodes and parse their names
-	// Maybe in the future we'll map threshold nodes by ID
-	//cout << "Size of network is " << network.size() << '\n';
-	for(unsigned int i=0; i<network.size(); ++i) {
-		//cout << "Name = " << network[i]->name << '\n';
-		if(network[i]->name.size()) {
-			string s = network[i]->name;
-			// Warning - the next bit is fragile and dependent on my current naming scheme
-			//cout << "substr = " << s.substr(0,3) << '\n';
-			//cout << "size of s = " << s.size() << '\n'; 
-			if(s.substr(0,3) == "rwy") {
-				//cout << "subsubstr = " << s.substr(4, s.size() - 4) << '\n';
-				if(s.substr(4, s.size() - 4) == rwyID) {
-					return network[i];
-				}
-			}
-		}
-	}
-	return NULL;
-}
-
-
-// Get a path from a point on a runway to a gate
-// TODO !!
-
-// Get a path from a node to another node
-// Eventually we will need complex algorithms for this taking other traffic,
-// shortest path and suitable paths into accout.
-// For now we'll just call the shortest path algorithm.
-ground_network_path_type FGGround::GetPath(node* A, node* B) {	
-	return(GetShortestPath(A, B));
-};
-
-// Get a path from a node to a runway threshold
-ground_network_path_type FGGround::GetPath(node* A, const string& rwyID) {
-	node* b = GetThresholdNode(rwyID);
-	if(b == NULL) {
-		SG_LOG(SG_ATC, SG_ALERT, "ERROR - unable to find path to runway theshold in ground.cxx for airport " << ident << '\n');
-		ground_network_path_type emptyPath;
-		emptyPath.erase(emptyPath.begin(), emptyPath.end());
-		return(emptyPath);
-	}
-	return GetShortestPath(A, b);
-}
-
-// Get a path from a node to a runway hold short point
-// Bit of a hack this at the moment!
-ground_network_path_type FGGround::GetPathToHoldShort(node* A, const string& rwyID) {
-	ground_network_path_type path = GetPath(A, rwyID);
-	path.pop_back();	// That should be the threshold stripped of 
-	path.pop_back();	// and that should be the arc from hold short to threshold
-	// This isn't robust though - TODO - implement properly!
-	return(path);
-}
-
-// A shortest path algorithm from memory (ie. I can't find the bl&*dy book again!)
-// I'm sure there must be enchancements that we can make to this, such as biasing the
-// order in which the nodes are searched out from in favour of those geographically
-// closer to the destination.
-// Note that we are working with the master set of nodes and arcs so we mustn't change
-// or delete them -  we only delete the paths that we create during the algorithm.
-ground_network_path_type FGGround::GetShortestPath(node* A, node* B) {
-	a_path* pathPtr;
-	shortest_path_map_type pathMap;
-	node_array_type nodesLeft;
-	
-	// Debugging check
-	int pathsCreated = 0;
-	
-	// Initialise the algorithm
-	nodesLeft.push_back(A);
-	pathPtr = new a_path;
-	pathsCreated++;
-	pathPtr->path.push_back(A);
-	pathPtr->cost = 0;
-	pathMap[A->nodeID] = pathPtr;
-	bool solution_found = false;	// Flag to indicate that at least one candidate path has been found
-	int solution_cost = -1;			// Cost of current best cost solution.  -1 indicates no solution found yet.
-	a_path solution_path;		
-											
-	node* nPtr;	// nPtr is used to point to the node we are currently working with
-	
-	while(nodesLeft.size()) {
-		//cout << "\n*****nodesLeft*****\n";
-		//for(unsigned int i=0; i<nodesLeft.size(); ++i) {
-			//cout << nodesLeft[i]->nodeID << '\n';
-		//}
-		//cout << "*******************\n\n";
-		nPtr = *nodesLeft.begin();		// Thought - definate optimization possibilities here in the choice of which nodes we process first.
-		nodesLeft.erase(nodesLeft.begin());
-		//cout << "Walking out from node " << nPtr->nodeID << '\n';
-		for(unsigned int i=0; i<nPtr->arcs.size(); ++i) {
-			//cout << "ARC TO " << ((nPtr->arcs[i]->n1 == nPtr->nodeID) ? nPtr->arcs[i]->n2 : nPtr->arcs[i]->n1) << '\n';
-		}
-		if((solution_found) && (solution_cost <= pathMap[nPtr->nodeID]->cost)) {
-			// Do nothing - we've already found a solution and this partial path is already more expensive
-		} else {
-			// This path could still be better than the current solution - check it out
-			for(unsigned int i=0; i<(nPtr->arcs.size()); i++) {
-				// Map the new path against the end node, ie. *not* the one we just started with.
-				unsigned int end_nodeID = ((nPtr->arcs[i]->n1 == nPtr->nodeID) ? nPtr->arcs[i]->n2 : nPtr->arcs[i]->n1);
-				//cout << "end_nodeID = " << end_nodeID << '\n';
-				//cout << "pathMap size is " << pathMap.size() << '\n';
-				if(end_nodeID == nPtr->nodeID) {
-					//cout << "Circular arc!\n";
-					// Then its a circular arc - don't bother!!
-					//nPtr->arcs.erase(nPtr->arcs.begin() + i);
-				} else {
-					// see if the end node is already in the map or not
-					if(pathMap.find(end_nodeID) == pathMap.end()) {
-						//cout << "Not in the map" << endl;;
-						// Not in the map - easy!
-						pathPtr = new a_path;
-						pathsCreated++;
-						*pathPtr = *pathMap[nPtr->nodeID];	// *copy* the path
-						pathPtr->path.push_back(nPtr->arcs[i]);
-						pathPtr->path.push_back(network[end_nodeID]);
-						pathPtr->cost += nPtr->arcs[i]->distance;
-						pathMap[end_nodeID] = pathPtr;
-						nodesLeft.push_back(network[end_nodeID]);	// By definition this can't be in the list already, or
-						// it would also have been in the map and hence OR'd with this one.
-						if(end_nodeID == B->nodeID) {
-							//cout << "Solution found!!!" << endl;
-							// Since this node wasn't in the map this is by definition the first solution
-							solution_cost = pathPtr->cost;
-							solution_path = *pathPtr;
-							solution_found = true;
-						}
-					} else {
-						//cout << "Already in the map" << endl;
-						// In the map - not so easy - need to get rid of an arc from the higher cost one.
-						//cout << "Current cost of node " << end_nodeID << " is " << pathMap[end_nodeID]->cost << endl;
-						int newCost = pathMap[nPtr->nodeID]->cost + nPtr->arcs[i]->distance;
-						//cout << "New cost is of node " << nPtr->nodeID << " is " << newCost << endl;
-						if(newCost >= pathMap[end_nodeID]->cost) {
-							// No need to do anything.
-							//cout << "Not doing anything!" << endl;
-						} else {
-							delete pathMap[end_nodeID];
-							pathsCreated--;
-							
-							pathPtr = new a_path;
-							pathsCreated++;
-							*pathPtr = *pathMap[nPtr->nodeID];	// *copy* the path
-							pathPtr->path.push_back(nPtr->arcs[i]);
-							pathPtr->path.push_back(network[end_nodeID]);
-							pathPtr->cost += nPtr->arcs[i]->distance;
-							pathMap[end_nodeID] = pathPtr;
-							
-							// We need to add this node to the list-to-do again to force a recalculation 
-							// onwards from this node with the new lower cost to node cost.
-							nodesLeft.push_back(network[end_nodeID]);
-							
-							if(end_nodeID == B->nodeID) {
-								//cout << "Solution found!!!" << endl;
-								// Need to check if there is a previous better solution
-								if((solution_cost < 0) || (pathPtr->cost < solution_cost)) {
-									solution_cost = pathPtr->cost;
-									solution_path = *pathPtr;
-									solution_found = true;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	// delete all the paths before returning
-	shortest_path_map_iterator spItr = pathMap.begin();
-	while(spItr != pathMap.end()) {
-		if(spItr->second != NULL) {
-			delete spItr->second;
-			--pathsCreated;
-		}
-		++spItr;
-	}
-	
-	//cout << "pathsCreated = " << pathsCreated << '\n';
-	if(pathsCreated > 0) {
-		SG_LOG(SG_ATC, SG_ALERT, "WARNING - Possible memory leak in FGGround::GetShortestPath\n\
-									  Please report to flightgear-devel@flightgear.org\n");
-	}
-	
-	//cout << (solution_found ? "Result: solution found\n" : "Result: no solution found\n");
-	return(solution_path.path);		// TODO - we really ought to have a fallback position incase a solution isn't found.
-}
-		
-
-
-// Randomly or otherwise populate some of the gates with parked planes
-// (might eventually be done by the AIMgr if and when lots of AI traffic is generated)
-
-// Return a list of exits from a given runway
-// It is up to the calling function to check for non-zero size of returned array before use
-node_array_type FGGround::GetExits(const string& rwyID) {
-	// FIXME - get a 07L or similar in here and we're stuffed!!!
-	return(runways[atoi(rwyID.c_str())].exits);
-}
diff --git a/src/ATCDCL/ground.hxx b/src/ATCDCL/ground.hxx
deleted file mode 100644
index 345787475..000000000
--- a/src/ATCDCL/ground.hxx
+++ /dev/null
@@ -1,328 +0,0 @@
-// FGGround - a class to provide ground control at larger airports.
-//
-// Written by David Luff, started March 2002.
-//
-// Copyright (C) 2002  David C. Luff - david.luff@nottingham.ac.uk
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-#ifndef _FG_GROUND_HXX
-#define _FG_GROUND_HXX
-
-#include <map>
-#include <vector>
-#include <list>
-
-#include <simgear/math/SGMath.hxx>
-#include <simgear/misc/sgstream.hxx>
-#include <simgear/props/props.hxx>
-
-#include "ATC.hxx"
-#include "ATCProjection.hxx"
-
-#include <string>
-
-class FGATCMgr;
-
-//////////////////////////////////////////////////////
-// Types for the logical network data structure
-enum arc_type {
-	RUNWAY,
-	TAXIWAY
-};
-
-enum node_type {
-	GATE,
-	APRON,
-	HOLD,
-	JUNCTION,
-	TJUNCTION
-};
-
-enum GateType {
-	TRANSPORT_PASSENGER,
-	TRANSPORT_PASSENGER_NARROWBODY,
-	TRANSPORT_PASSENGER_WIDEBODY,
-	TRANSPORT_CARGO,
-	GA_LOCAL,
-	GA_LOCAL_SINGLE,
-	GA_LOCAL_TWIN,
-	GA_TRANSIENT,
-	GA_TRANSIENT_SINGLE,
-	GA_TRANSIENT_TWIN,
-	OTHER	// ie. anything goes!!
-};
-
-enum network_element_type {
-	NODE,
-	ARC
-};
-
-struct ground_network_element {
-	network_element_type struct_type;
-};
-
-struct arc : public ground_network_element {
-	int distance;
-	std::string name;
-	arc_type type;
-	bool directed;	//false if 2-way, true if 1-way.  
-	//This is a can of worms since arcs might be one way in different directions under different circumstances
-	unsigned int n1;	// The nodeID of the first node
-	unsigned int n2;	// The nodeID of the second node
-	// If the arc is directed then flow is normally from n1 to n2.  See the above can of worms comment though.
-};
-
-typedef std::vector <arc*> arc_array_type;	// This was and may become again a list instead of vector
-typedef arc_array_type::iterator arc_array_iterator;
-typedef arc_array_type::const_iterator arc_array_const_iterator; 
-
-struct node : public ground_network_element {
-	node();
-	~node();
-	
-	unsigned int nodeID;	//each node in an airport needs a unique ID number - this is ZERO-BASED to match array position
-	SGGeod pos;
-	SGVec3d orthoPos;
-	std::string name;
-	node_type type;
-	arc_array_type arcs;
-	double max_turn_radius;
-};
-
-typedef std::vector <node*> node_array_type;
-typedef node_array_type::iterator node_array_iterator;
-typedef node_array_type::const_iterator node_array_const_iterator;
-
-struct Gate : public node {
-	GateType gateType;
-	int max_weight;	//units??
-	//airline_code airline;	//For the future - we don't have any airline codes ATM
-	int id;	// The gate number in the logical scheme of things
-	std::string name;	// The real-world gate letter/number
-	//node* pNode;
-	bool used;
-	double heading;	// The direction the parked-up plane should point in degrees
-};
-
-typedef std::vector < Gate* > gate_vec_type;
-typedef gate_vec_type::iterator gate_vec_iterator;
-typedef gate_vec_type::const_iterator gate_vec_const_iterator;
-
-// A map of gate vs. the logical (internal FGFS) gate ID
-typedef std::map < int, Gate* > gate_map_type;
-typedef gate_map_type::iterator gate_map_iterator;
-typedef gate_map_type::const_iterator gate_map_const_iterator;
-
-// Runways - all the runway stuff is likely to change in the future
-struct Rwy {
-	int id;	//note this is a very simplified scheme for now - R & L are not differentiated
-	//It should work for simple one rwy airports
-	node_array_type exits;	//Array of available exits from runway
-	// should probably add an FGRunway structure here as well eventually
-	// Eventually we will also want some encoding of real-life preferred runways
-	// This will get us up and running for single runway airports though.
-};
-
-typedef std::vector < Rwy > runway_array_type;
-typedef runway_array_type::iterator runway_array_iterator;
-typedef runway_array_type::const_iterator runway_array_const_iterator;
-
-// end logical network types
-///////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////
-// Structures to use the network
-
-// A path through the network 
-typedef std::vector < ground_network_element* > ground_network_path_type;
-typedef ground_network_path_type::iterator ground_network_path_iterator;
-typedef ground_network_path_type::const_iterator ground_network_path_const_iterator;
-
-//////////////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////
-//
-// Stuff for the shortest-path algorithms
-struct a_path {
-	a_path();
-	
-	ground_network_path_type path;
-	int cost;
-};
-
-// Paths mapped by nodeID reached so-far
-typedef std::map < unsigned int, a_path* > shortest_path_map_type;
-typedef shortest_path_map_type::iterator shortest_path_map_iterator;
-
-// Nodes mapped by their ID
-//typedef map < unsigned int, node* > node_map_type;
-//typedef node_map_type::iterator node_map_iterator;
-////////////////////////////////////////////////
-
-// Planes active within the ground network.
-
-// A more specialist plane rec to include ground information
-struct GroundRec {	
-    PlaneRec plane;
-    node* destination;
-    node* last_clearance;
-    bool taxiRequestOutstanding;	// Plane has requested taxi and we haven't responded yet
-    double clearanceCounter;		// Hack for communication timing - counter since clearance requested in seconds 
-	
-    bool cleared;  // set true when the plane has been cleared to somewhere
-    bool incoming; //true for arrivals, false for departures
-    // status?
-    // Almost certainly need to add more here
-};
-
-typedef std::list < GroundRec* > ground_rec_list;
-typedef ground_rec_list::iterator ground_rec_list_itr;
-typedef ground_rec_list::const_iterator ground_rec_list_const_itr;
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// FGGround
-//
-///////////////////////////////////////////////////////////////////////////////
-class FGGround : public FGATC {
-
-public:
-	FGGround();
-	FGGround(const std::string& id);
-	~FGGround();
-    void Init();
-
-    void Update(double dt);
-	
-	inline const std::string& get_trans_ident() { return trans_ident; }
-	
-	// Randomly fill some of the available gates and GA parking spots with planes
-	void PopulateGates();
-	
-	// Return a suitable gate (maybe this should be a list of suitable gates so the plane or controller can choose the closest one)
-	void ReturnGate(Gate &gate, GateType type);
-	
-	// Return a pointer to an unused gate
-	Gate* GetGateNode();
-	
-	// Return a pointer to a hold short node
-	node* GetHoldShortNode(const std::string& rwyID);
-	
-	// Runway stuff - this might change in the future.
-	// Get a list of exits from a given runway
-	// It is up to the calling function to check for non-zero size of returned array before use
-	node_array_type GetExits(const std::string& rwyID);
-	
-	// Get a path from one node to another
-	ground_network_path_type GetPath(node* A, node* B);
-	
-	// Get a path from a node to a runway threshold
-	ground_network_path_type GetPath(node* A, const std::string& rwyID);
-	
-	// Get a path from a node to a runway hold short point
-	// Bit of a hack this at the moment!
-	ground_network_path_type GetPathToHoldShort(node* A, const std::string& rwyID);
-
-private:
-	FGATCMgr* ATCmgr;	
-	// This is purely for synactic convienience to avoid writing globals->get_ATC_mgr()-> all through the code!
-	
-    // Need a data structure to hold details of the various active planes
-    // Need a data structure to hold details of the logical network
-    // including which gates are filled - or possibly another data structure
-    // with the positions of the inactive planes.
-    // Need a data structure to hold outstanding communications from aircraft.
-    // Possibly need a data structure to hold outstanding communications to aircraft.
-
-	// The logical network
-	// NODES WILL BE STORED IN THE NETWORK IN ORDER OF nodeID NUMBER
-	// ie. NODE 5 WILL BE AT network[5]
-    node_array_type network;
-	
-	// A map of all the gates indexed against internal (FGFS) ID
-	gate_map_type gates;
-	gate_map_iterator gatesItr;
-
-	FGATCAlignedProjection ortho;
-	
-	// Planes currently active
-    //ground_rec_list ground_traffic;
-
-    // Find the shortest route through the logical network between two points.
-    //FindShortestRoute(point a, point b);
-
-    // Assign a gate or parking location to a new arrival
-    //AssignGate(ground_rec &g);
-
-    // Generate the next clearance for an airplane
-    //NextClearance(ground_rec &g);
-	
-	// environment - need to make sure we're getting the surface winds and not winds aloft.
-	SGPropertyNode_ptr wind_from_hdg;	//degrees
-	SGPropertyNode_ptr wind_speed_knots;		//knots
-	
-	// for failure modeling
-	std::string trans_ident;		// transmitted ident
-	bool ground_failed;		// ground failed?
-	bool networkLoadOK;		// Indicates whether LoadNetwork returned true or false at last attempt
-	
-	// Tower control
-	bool untowered;		// True if this is an untowered airport (we still need the ground class for shortest path implementation etc
-	//FGATC* tower;		// Pointer to the tower control
-
-	// Logical runway details - this might change in the future.
-	//runway_array_type runways;	// STL way
-	Rwy runways[37];	// quick hack!
-	
-	// Physical runway details
-	double aptElev;		// Airport elevation
-	std::string activeRwy;	// Active runway number - For now we'll disregard multiple / alternate runway operation.
-	RunwayDetails rwy;	// Assumed to be the active one for now.// Figure out which runways are active.
-	
-	// For now we'll just be simple and do one active runway - eventually this will get much more complex
-	// Copied from FGTower - TODO - it would be better to implement this just once, and have ground call tower
-	// for runway operation details, but at the moment we can't guarantee that tower control at a given airport
-	// will be initialised before ground so we can't do that.
-	void DoRwyDetails();	
-	
-	// Load the logical ground network for this airport from file.
-	// Return true if successfull.
-	bool LoadNetwork();
-	
-	// Parse a runway exit string and push the supplied node pointer onto the runway exit list
-	void ParseRwyExits(node* np, char* es);
-	
-	// Return a random gate ID of an unused gate.
-	// Two error values may be returned and must be checked for by the calling function:
-	// -2 signifies that no gates exist at this airport.
-	// -1 signifies that all gates are currently full.
-	// TODO - modify to return a suitable gate based on aircraft size/weight.
-	int GetRandomGateID();
-	
-	// Return a pointer to the node at a runway threshold
-	// Returns NULL if unsuccessful.
-	node* GetThresholdNode(const std::string& rwyID);
-	
-	// A shortest path algorithm from memory (I can't find the bl&*dy book again!)
-	ground_network_path_type GetShortestPath(node* A, node* B); 
-	
-	// Planes
-	ground_rec_list ground_traffic;
-	ground_rec_list_itr ground_traffic_itr;
-};
-
-#endif	// _FG_GROUND_HXX
-
diff --git a/src/ATCDCL/tower.cxx b/src/ATCDCL/tower.cxx
deleted file mode 100644
index f765fa4ee..000000000
--- a/src/ATCDCL/tower.cxx
+++ /dev/null
@@ -1,2538 +0,0 @@
-// FGTower - a class to provide tower control at towered airports.
-//
-// Written by David Luff, started March 2002.
-//
-// Copyright (C) 2002  David C. Luff - david.luff@nottingham.ac.uk
-// Copyright (C) 2008  Daniyar Atadjanov (ground clearance, gear check, weather, etc.)
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#ifdef HAVE_STRINGS_H
-#  include <strings.h>   // bcopy()
-#else
-#  include <string.h>    // MSVC doesn't have strings.h
-#endif
-
-#include <sstream>
-#include <iomanip>
-#include <iostream>
-
-#include <simgear/debug/logstream.hxx>
-#include <simgear/math/sg_geodesy.hxx>
-#include <simgear/math/sg_random.h>
-#include <simgear/misc/sg_path.hxx>
-
-#include <Main/globals.hxx>
-#include <Airports/runways.hxx>
-
-#include "tower.hxx"
-#include "ground.hxx"
-#include "ATCmgr.hxx"
-#include "ATCutils.hxx"
-#include "ATCDialog.hxx"
-#include "commlist.hxx"
-
-
-using std::cout;
-
-// TowerPlaneRec
-
-TowerPlaneRec::TowerPlaneRec() :
-	eta(0),
-	dist_out(0),
-	clearedToLand(false),
-	clearedToLineUp(false),
-	clearedToTakeOff(false),
-	holdShortReported(false),
-	lineUpReported(false),
-	downwindReported(false),
-	longFinalReported(false),
-	longFinalAcknowledged(false),
-	finalReported(false),
-	finalAcknowledged(false),
-	rwyVacatedReported(false),
-	rwyVacatedAcknowledged(false),
-	goAroundReported(false),
-	instructedToGoAround(false),
-	onRwy(false),
-	nextOnRwy(false),
-	gearWasUp(false),
-	gearUpReported(false),
-	vfrArrivalReported(false),
-	vfrArrivalAcknowledged(false),
-	opType(TTT_UNKNOWN),
-	leg(LEG_UNKNOWN),
-	landingType(AIP_LT_UNKNOWN),
-	isUser(false)
-{
-	plane.callsign = "UNKNOWN";
-}
-
-TowerPlaneRec::TowerPlaneRec(const PlaneRec& p) :
-	eta(0),
-	dist_out(0),
-	clearedToLand(false),
-	clearedToLineUp(false),
-	clearedToTakeOff(false),
-	holdShortReported(false),
-	lineUpReported(false),
-	downwindReported(false),
-	longFinalReported(false),
-	longFinalAcknowledged(false),
-	finalReported(false),
-	finalAcknowledged(false),
-	rwyVacatedReported(false),
-	rwyVacatedAcknowledged(false),
-	goAroundReported(false),
-	instructedToGoAround(false),
-	onRwy(false),
-	nextOnRwy(false),
-	gearWasUp(false),
-	gearUpReported(false),
-	vfrArrivalReported(false),
-	vfrArrivalAcknowledged(false),
-	opType(TTT_UNKNOWN),
-	leg(LEG_UNKNOWN),
-	landingType(AIP_LT_UNKNOWN),
-	isUser(false)
-{
-	plane = p;
-}
-
-TowerPlaneRec::TowerPlaneRec(const SGGeod& pt) :
-	eta(0),
-	dist_out(0),
-	clearedToLand(false),
-	clearedToLineUp(false),
-	clearedToTakeOff(false),
-	holdShortReported(false),
-	lineUpReported(false),
-	downwindReported(false),
-	longFinalReported(false),
-	longFinalAcknowledged(false),
-	finalReported(false),
-	finalAcknowledged(false),
-	rwyVacatedReported(false),
-	rwyVacatedAcknowledged(false),
-	goAroundReported(false),
-	instructedToGoAround(false),
-	onRwy(false),
-	nextOnRwy(false),
-	gearWasUp(false),
-	gearUpReported(false),
-	vfrArrivalReported(false),
-	vfrArrivalAcknowledged(false),
-	opType(TTT_UNKNOWN),
-	leg(LEG_UNKNOWN),
-	landingType(AIP_LT_UNKNOWN),
-	isUser(false)
-{
-	plane.callsign = "UNKNOWN";
- 	pos = pt;
-}
-
-TowerPlaneRec::TowerPlaneRec(const PlaneRec& p, const SGGeod& pt) :
-	eta(0),
-	dist_out(0),
-	clearedToLand(false),
-	clearedToLineUp(false),
-	clearedToTakeOff(false),
-	holdShortReported(false),
-	lineUpReported(false),
-	downwindReported(false),
-	longFinalReported(false),
-	longFinalAcknowledged(false),
-	finalReported(false),
-	finalAcknowledged(false),
-	rwyVacatedReported(false),
-	rwyVacatedAcknowledged(false),
-	goAroundReported(false),
-	instructedToGoAround(false),
-	onRwy(false),
-	nextOnRwy(false),
-	gearWasUp(false),
-	gearUpReported(false),
-	vfrArrivalReported(false),
-	vfrArrivalAcknowledged(false),
-	opType(TTT_UNKNOWN),
-	leg(LEG_UNKNOWN),
-	landingType(AIP_LT_UNKNOWN),
-	isUser(false)
-{
-	plane = p;
- 	pos = pt;
-}
-
-
-// FGTower
-
-/*******************************************
-               TODO List
-			   
-Currently user is assumed to have taken off again when leaving the runway - check speed/elev for taxiing-in. (MAJOR)
-
-Use track instead of heading to determine what leg of the circuit the user is flying. (MINOR)
-
-Use altitude as well as position to try to determine if the user has left the circuit. (MEDIUM - other issues as well).
-
-Currently HoldShortReported code assumes there will be only one plane holding for the runway at once and 
-will break when planes start queueing. (CRITICAL)
-
-Report-Runway-Vacated is left as only user ATC option following a go-around. (MAJOR)
-
-Report-Downwind is not added as ATC option when user takes off to fly a circuit. (MAJOR)
-
-eta of USER can be calculated very wrongly in circuit if flying straight out and turn4 etc are with +ve ortho y. 
-This can then screw up circuit ordering for other planes (MEDIUM)
-
-USER leaving circuit needs to be more robustly considered when intentions unknown
-Currently only considered during climbout and breaks when user turns (MEDIUM).
-
-GetPos() of the AI planes is called erratically - either too much or not enough. (MINOR)
-
-GO-AROUND is instructed very late at < 12s to landing - possibly make more dependent on chance of rwy clearing before landing (FEATURE)
-
-Need to make clear when TowerPlaneRecs do or don't get deleted in RemoveFromCircuitList etc. (MINOR until I misuse it - then CRITICAL!)
-
-FGTower::RemoveAllUserDialogOptions() really ought to be replaced by an ATCDialog::clear_entries() function. (MINOR - efficiency).
-
-At the moment planes in the lists are not guaranteed to always have a sensible ETA - it should be set as part of AddList functions, and lists should only be accessed this way. (FAIRLY MAJOR). 
-*******************************************/
-
-FGTower::FGTower() :
-	separateGround(true),
-	ground(0)
-{
-	ATCmgr = globals->get_ATC_mgr();
-	
-	_type = TOWER;
-	
-	// Init the property nodes - TODO - need to make sure we're getting surface winds.
-	wind_from_hdg = fgGetNode("/environment/wind-from-heading-deg", true);
-	wind_speed_knots = fgGetNode("/environment/wind-speed-kt", true);
-	
-	update_count = 0;
-	update_count_max = 15;
-	
-	holdListItr = holdList.begin();
-	appListItr = appList.begin();
-	depListItr = depList.begin();
-	rwyListItr = rwyList.begin();
-	circuitListItr = circuitList.begin();
-	trafficListItr = trafficList.begin();
-	vacatedListItr = vacatedList.begin();
-	
-	freqClear = true;
-	
-	timeSinceLastDeparture = 9999;
-	departed = false;
-	
-	nominal_downwind_leg_pos = 1000.0;
-	nominal_base_leg_pos = -1000.0;
-	// TODO - set nominal crosswind leg pos based on minimum distance from takeoff end of rwy.
-	
-	_departureControlled = false;
-}
-
-FGTower::~FGTower() {
-	if(!separateGround) {
-		delete ground;
-	}
-}
-
-void FGTower::Init() {
-	//cout << "Initialising tower " << ident << '\n';
-	
-	// Pointers to user's position
-	user_lon_node = fgGetNode("/position/longitude-deg", true);
-	user_lat_node = fgGetNode("/position/latitude-deg", true);
-	user_elev_node = fgGetNode("/position/altitude-ft", true);
-	user_hdg_node = fgGetNode("/orientation/heading-deg", true);
-	
-	// Need some way to initialise rwyOccupied flag correctly if the user is on the runway and to know its the user.
-	// I'll punt the startup issue for now though!!!
-	rwyOccupied = false;
-	
-	// Setup the ground control at this airport
-	AirportATC a;
-	//cout << "Tower ident = " << ident << '\n';
-	if(ATCmgr->GetAirportATCDetails(ident, &a)) {
-		if(a.ground_freq) {		// Ground control
-			ground = (FGGround*)ATCmgr->GetATCPointer(ident, GROUND);
-			separateGround = true;
-			if(ground == NULL) {
-				// Something has gone wrong :-(
-				SG_LOG(SG_ATC, SG_WARN, "ERROR - ground has frequency but can't get ground pointer :-(");
-				ground = new FGGround(ident);
-				separateGround = false;
-				ground->Init();
-				if(_display) {
-					ground->SetDisplay();
-				} else {
-					ground->SetNoDisplay();
-				}
-			}
-		} else {
-			// Initialise ground anyway to do the shortest path stuff!
-			// Note that we're now responsible for updating and deleting this - NOT the ATCMgr.
-			ground = new FGGround(ident);
-			separateGround = false;
-			ground->Init();
-			if(_display) {
-				ground->SetDisplay();
-			} else {
-				ground->SetNoDisplay();
-			}
-		}
-	} else {
-		SG_LOG(SG_ATC, SG_ALERT, "Unable to find airport details for " << ident << " in FGTower::Init()");
-		// Initialise ground anyway to avoid segfault later
-		ground = new FGGround(ident);
-		separateGround = false;
-		ground->Init();
-		if(_display) {
-			ground->SetDisplay();
-		} else {
-			ground->SetNoDisplay();
-		}
-	}
-	
-	RemoveAllUserDialogOptions();
-	
-	// TODO - attempt to get a departure control pointer to see if we need to hand off departing traffic to departure.
-	
-	// Get the airport elevation
-	aptElev = fgGetAirportElev(ident.c_str());
-	
-	// TODO - this function only assumes one active rwy.
-	DoRwyDetails();
-	
-	// TODO - this currently assumes only one active runway.
-	rwyOccupied = OnActiveRunway(SGGeod::fromDegM(user_lon_node->getDoubleValue(), user_lat_node->getDoubleValue(), 0.0));
-	
-	if(!OnAnyRunway(SGGeod::fromDegM(user_lon_node->getDoubleValue(), user_lat_node->getDoubleValue(), 0.0), false)) {
-		//cout << ident << "  ADD 0\n";
-		current_atcdialog->add_entry(ident, "@AP Tower, @CS @MI miles @CD of the airport for full stop@AT",
-				"Contact tower for VFR arrival (full stop)", TOWER,
-				(int)USER_REQUEST_VFR_ARRIVAL_FULL_STOP);
-	} else {
-		//cout << "User found on active runway\n";
-		// Assume the user is started at the threshold ready to take-off
-		TowerPlaneRec* t = new TowerPlaneRec;
-		t->plane.callsign = fgGetString("/sim/user/callsign");
-		t->plane.type = GA_SINGLE;	// FIXME - hardwired!!
-		t->opType = TTT_UNKNOWN;	// We don't know if the user wants to do circuits or a departure...
-		t->landingType = AIP_LT_UNKNOWN;
-		t->leg = TAKEOFF_ROLL;
-		t->isUser = true;
-		t->clearedToTakeOff = false;
-		rwyList.push_back(t);
-		rwyListItr = rwyList.begin();
-		departed = false;
-		current_atcdialog->add_entry(ident, "@CS @TO", "Request departure / take-off clearance",
-				TOWER, (int)USER_REQUEST_TAKE_OFF);
-	}
-}
-
-void FGTower::Update(double dt) {
-	//cout << "T" << endl;
-	// Each time step, what do we need to do?
-	// We need to go through the list of outstanding requests and acknowedgements
-	// and process at least one of them.
-	// We need to go through the list of planes under our control and check if
-	// any need to be addressed.
-	// We need to check for planes not under our control coming within our 
-	// control area and address if necessary.
-	
-	// TODO - a lot of the below probably doesn't need to be called every frame and should be staggered.
-	
-	// Sort the arriving planes
-	
-	/*
-	if(ident == "KEMT") {
-		cout << update_count << "\ttL: " << trafficList.size() << "  cL: " << circuitList.size() << "  hL: " << holdList.size() << "  aL: " << appList.size() << '\n';
-	}
-	*/
-	//if(ident == "EGNX") cout << display << '\n';
-	
-	if(departed != false) {
-		timeSinceLastDeparture += dt;
-		//if(ident == "KEMT") 
-		//	cout << "  dt = " << dt << "  timeSinceLastDeparture = " << timeSinceLastDeparture << '\n';
-	}
-	
-	//cout << ident << " respond = " << respond << " responseReqd = " << responseReqd << '\n'; 
-	if(respond) {
-		if(!responseReqd) SG_LOG(SG_ATC, SG_ALERT, "ERROR - respond is true and responseReqd is false in FGTower::Update(...)");
-		Respond();
-		respond = false;
-		responseReqd = false;
-	}
-	
-	// Calculate the eta of each plane to the threshold.
-	// For ground traffic this is the fastest they can get there.
-	// For air traffic this is the middle approximation.
-	if(update_count == 1) {
-		doThresholdETACalc();
-	}
-	
-	// Order the list of traffic as per expected threshold use and flag any conflicts
-	if(update_count == 2) {
-		//bool conflicts = doThresholdUseOrder();
-		doThresholdUseOrder();
-	}
-	
-	// sortConficts() !!!
-	
-	if(update_count == 4) {
-		CheckHoldList(dt);
-	}
-	
-	// Uggh - HACK - why have we got rwyOccupied - wouldn't simply testing rwyList.size() do?
-	if(rwyList.size()) {
-		rwyOccupied = true;
-	} else {
-		rwyOccupied = false;
-	}
-	
-	if(update_count == 5 && rwyOccupied) {
-		CheckRunwayList(dt);
-	}
-		
-	if(update_count == 6) {
-		CheckCircuitList(dt);
-	}
-	
-	if(update_count == 7) {
-		CheckApproachList(dt);
-	}
-	
-	if(update_count == 8) {
-		CheckDepartureList(dt);
-	}
-	
-	// TODO - do one plane from the departure list and set departed = false when out of consideration
-	
-	//doCommunication();
-	
-	if(!separateGround) {
-		// The display stuff might have to get more clever than this when not separate 
-		// since the tower and ground might try communicating simultaneously even though
-		// they're mean't to be the same contoller/frequency!!
-		// We could also get rid of this by overloading FGATC's Set(No)Display() functions.
-		if(_display) {
-			ground->SetDisplay();
-		} else {
-			ground->SetNoDisplay();
-		}
-		ground->Update(dt);
-	}
-	
-	++update_count;
-	// How big should ii get - ie how long should the update cycle interval stretch?
-	if(update_count >= update_count_max) {
-		update_count = 0;
-	}
-	
-	// Call the base class update for the response time handling.
-	FGATC::Update(dt);
-}
-
-void FGTower::ReceiveUserCallback(int code) {
-	if(code == (int)USER_REQUEST_VFR_DEPARTURE) {
-		RequestDepartureClearance("USER");
-	} else if(code == (int)USER_REQUEST_VFR_ARRIVAL) {
-		VFRArrivalContact("USER");
-	} else if(code == (int)USER_REQUEST_VFR_ARRIVAL_FULL_STOP) {
-		VFRArrivalContact("USER", FULL_STOP);
-	} else if(code == (int)USER_REQUEST_VFR_ARRIVAL_TOUCH_AND_GO) {
-		VFRArrivalContact("USER", TOUCH_AND_GO);
-	} else if(code == (int)USER_REPORT_DOWNWIND) {
-		ReportDownwind("USER");
-	} else if(code == (int)USER_REPORT_3_MILE_FINAL) {
-		// For now we'll just call report final instead of report long final to avoid having to alter the response code
-		ReportFinal("USER");
-	} else if(code == (int)USER_REPORT_RWY_VACATED) {
-		ReportRunwayVacated("USER");
-	} else if(code == (int)USER_REPORT_GOING_AROUND) {
-		ReportGoingAround("USER");
-	} else if(code == (int)USER_REQUEST_TAKE_OFF) {
-		RequestTakeOffClearance("USER");
-	}
-}
-
-// **************** RESPONSE FUNCTIONS ****************
-
-void FGTower::Respond() {
-	//cout << "\nEntering Respond, responseID = " << responseID << endl;
-	TowerPlaneRec* t = FindPlane(responseID);
-	if(t) {
-		// This will grow!!!
-		if(t->vfrArrivalReported && !t->vfrArrivalAcknowledged) {
-			//cout << "Tower " << ident << " is responding to VFR arrival reported...\n";
-			// Testing - hardwire straight in for now
-			string trns = t->plane.callsign;
-			trns += " ";
-			trns += name;
-			trns += " Tower,";
-			// Should we clear staight in or for downwind entry?
-			// For now we'll clear straight in if greater than 1km from a line drawn through the threshold perpendicular to the rwy.
-			// Later on we might check the actual heading and direct some of those to enter on downwind or base.
-			SGVec3d op = ortho.ConvertToLocal(t->pos);
-			float gp = fgGetFloat("/gear/gear/position-norm");
-			if(gp < 1)
-				t->gearWasUp = true; // This will be needed on final to tell "Gear down, ready to land."
-			if(op.y() < -1000) {
-				trns += " Report three mile straight-in runway ";
-				t->opType = STRAIGHT_IN;
-				if(t->isUser) {
-					current_atcdialog->add_entry(ident, "@CS @MI mile final runway @RW@GR", "Report Final", TOWER, (int)USER_REPORT_3_MILE_FINAL);
-				}
-			} else {
-				// For now we'll just request reporting downwind.
-				// TODO - In real life something like 'report 2 miles southwest right downwind rwy 19R' might be used
-				// but I'm not sure how to handle all permutations of which direction to tell to report from yet.
-				trns += " Report ";
-				//cout << "Responding, rwy.patterDirection is " << rwy.patternDirection << '\n';
-				trns += ((rwy.patternDirection == 1) ? "right " : "left ");
-				trns += "downwind runway ";
-				t->opType = CIRCUIT;
-				// leave it in the app list until it gets into pattern though.
-				if(t->isUser) {
-					current_atcdialog->add_entry(ident, "@AP Tower, @CS Downwind @RW", "Report Downwind", TOWER, (int)USER_REPORT_DOWNWIND);
-				}
-			}
-			trns += ConvertRwyNumToSpokenString(activeRwy);
-			if(_display) {
-				pending_transmission = trns;
-				Transmit();
-			} else {
-				//cout << "Not displaying, trns was " << trns << '\n';
-			}
-			t->vfrArrivalAcknowledged = true;
-		} else if(t->downwindReported) {
-			//cout << "Tower " << ident << " is responding to downwind reported...\n";
-			ProcessDownwindReport(t);
-			t->downwindReported = false;
-		} else if(t->lineUpReported) {
-			string trns = t->plane.callsign;
-			if(rwyOccupied) {
-				double f = globals->get_ATC_mgr()->GetFrequency(ident, ATIS) / 100.0;
-				string wtr;
-				if(!f) {
-					wtr = ", " + GetWeather();
-				}
-				trns += " Cleared for take-off" + wtr;
-				t->clearedToTakeOff = true;
-			} else {
-				if(!OnAnyRunway(SGGeod::fromDegM(user_lon_node->getDoubleValue(), user_lat_node->getDoubleValue(), 0.0), true)) {
-					// TODO: Check if any AI Planes on final and tell something like: "After the landing CALLSIGN line up runway two eight right"
-					trns += " Line up runway " + ConvertRwyNumToSpokenString(activeRwy);
-					t->clearedToTakeOff = false;
-					current_atcdialog->add_entry(ident, "@CS @TO", "Report ready for take-off", TOWER, (int)USER_REQUEST_TAKE_OFF);
-
-				} else {
-					sg_srandom_time();
-					if((int(sg_random() * 10) + 1) != 3) {
-						t->clearedToTakeOff = true;
-						trns += " Cleared immediate take-off ";
-					} else {
-						t->clearedToTakeOff = false;
-						trns += " Negative, departure runway " + ConvertRwyNumToSpokenString(activeRwy);
-					}
-				}
-			}
-			if(_display) {
-				pending_transmission = trns;
-				Transmit();
-			} else {
-				//cout << "Not displaying, trns was " << trns << '\n';
-			}
-			t->lineUpReported = false;
-		} else if(t->holdShortReported) {
-			//cout << "Tower " << ident << " is reponding to holdShortReported...\n";
-			if(t->nextOnRwy) {
-				if(rwyOccupied) {	// TODO - ought to add a sanity check that it isn't this plane only on the runway (even though it shouldn't be!!)
-					// Do nothing for now - consider acknowloging hold short eventually
-				} else {
-					ClearHoldingPlane(t);
-					t->leg = TAKEOFF_ROLL;
-					rwyList.push_back(t);
-					rwyListItr = rwyList.begin();
-					rwyOccupied = true;
-					// WARNING - WE ARE ASSUMING ONLY ONE PLANE REPORTING HOLD AT A TIME BELOW
-					// FIXME TODO - FIX THIS!!!
-					if(!holdList.empty()) {
-						if(holdListItr == holdList.end()) {
-							holdListItr = holdList.begin();
-						}
-						holdList.erase(holdListItr);
-						holdListItr = holdList.begin();
-					}
-				}
-			} else {
-				// Tell him to hold and what position he is.
-				// Not currently sure under which circumstances we do or don't bother transmitting this.
-				string trns = t->plane.callsign;
-				trns += " hold position";
-				if(_display) {
-					pending_transmission = trns;
-					Transmit();
-				}
-				// TODO - add some idea of what traffic is blocking him.
-			}
-			t->holdShortReported = false;
-		} else if(t->finalReported && !(t->finalAcknowledged)) {
-			//cout << "Tower " << ident << " is responding to finalReported...\n";
-			bool disp = true;
-			string trns = t->plane.callsign;
-			//cout << (t->nextOnRwy ? "Next on rwy " : "Not next!! ");
-			//cout << (rwyOccupied ? "RWY OCCUPIED!!\n" : "Rwy not occupied\n");
-			if(t->nextOnRwy && !rwyOccupied && !(t->instructedToGoAround)) {
-				if(t->landingType == FULL_STOP) {
-					trns += " cleared to land ";
-				} else {
-					double f = globals->get_ATC_mgr()->GetFrequency(ident, ATIS) / 100.0;
-					string wtr;
-					if(!f) {
-						wtr = ", " + GetWeather();
-					} else {
-						wtr = ", runway " + ConvertRwyNumToSpokenString(activeRwy);
-					}
-					trns += " cleared to land" + wtr;
-				}
-				// TODO - add winds
-				t->clearedToLand = true;
-				// Maybe remove report downwind from menu here as well incase user didn't bother to?
-				if(t->isUser) {
-					//cout << "ADD VACATED B\n";
-					// Put going around at the top (and hence default) since that'll be more desperate,
-					// or put rwy vacated at the top since that'll be more common?
-					current_atcdialog->add_entry(ident, "@CS Going Around", "Report going around", TOWER, USER_REPORT_GOING_AROUND);
-					current_atcdialog->add_entry(ident, "@CS Clear of the runway", "Report runway vacated", TOWER, USER_REPORT_RWY_VACATED);
-				}
-			} else if(t->eta < 20) {
-				// Do nothing - we'll be telling it to go around in less than 10 seconds if the
-				// runway doesn't clear so no point in calling "continue approach".
-				disp = false;
-			} else {
-				trns += " continue approach";
-				trns += " and report ";
-				trns += ((rwy.patternDirection == 1) ? "right " : "left ");
-				trns += "downwind runway " + ConvertRwyNumToSpokenString(activeRwy);
-				t->opType = CIRCUIT;
-				if(t->isUser) {
-					current_atcdialog->add_entry(ident, "@AP Tower, @CS Downwind @RW", "Report Downwind", TOWER, (int)USER_REPORT_DOWNWIND);
-				}
-				t->clearedToLand = false;
-			}
-			if(_display && disp) {
-				pending_transmission = trns;
-				Transmit();
-			}
-			t->finalAcknowledged = true;
-		} else if(t->rwyVacatedReported && !(t->rwyVacatedAcknowledged)) {
-			ProcessRunwayVacatedReport(t);
-			t->rwyVacatedAcknowledged = true;
-		}
-	}
-	//freqClear = true;	// FIXME - set this to come true after enough time to render the message
-	_releaseCounter = 0.0;
-	_releaseTime = 5.5;
-	_runReleaseCounter = true;
-	//cout << "Done Respond\n" << endl;
-}
-
-void FGTower::ProcessDownwindReport(TowerPlaneRec* t) {
-	int i = 1;
-	int a = 0;	// Count of preceding planes on approach
-	bool cf = false;	// conflicting traffic on final
-	bool cc = false;	// preceding traffic in circuit
-	TowerPlaneRec* tc = NULL;
-	for(tower_plane_rec_list_iterator twrItr = circuitList.begin(); twrItr != circuitList.end(); twrItr++) {
-		if((*twrItr)->plane.callsign == responseID) break;
-		tc = *twrItr;
-		++i;
-	}
-	if(i > 1) { cc = true; }
-	doThresholdETACalc();
-	TowerPlaneRec* tf = NULL;
-	for(tower_plane_rec_list_iterator twrItr = appList.begin(); twrItr != appList.end(); twrItr++) {
-		if((*twrItr)->eta < (t->eta + 45) && strcmp((*twrItr)->plane.callsign.c_str(), t->plane.callsign.c_str()) != 0) { // don't let ATC ask you to follow yourself
-			a++;
-			tf = *twrItr;
-			cf = true;
-			// This should set the flagged plane to be the last conflicting one, and hence the one to follow.
-			// It ignores the fact that we might have problems slotting into the approach traffic behind it - 
-			// eventually we'll need some fancy algorithms for that!
-		}
-	}
-	string trns = t->plane.callsign;
-	trns += " Number ";
-	trns += ConvertNumToSpokenDigits(i + a);
-	// This assumes that the number spoken is landing position, not circuit position, since some of the traffic might be on straight-in final.
-	trns += " ";
-	TowerPlaneRec* tt = NULL;
-	if((i == 1) && rwyList.empty() && (t->nextOnRwy) && (!cf)) {	// Unfortunately nextOnRwy currently doesn't handle circuit/straight-in ordering properly at present, hence the cf check below.
-		trns += "Cleared to land";	// TODO - clear for the option if appropriate
-		t->clearedToLand = true;
-	} else if((i+a) > 1) {
-		//First set tt to point to the correct preceding plane - final or circuit
-		if(tc && tf) {
-			tt = (tf->eta < tc->eta ? tf : tc);
-		} else if(tc) {
-			tt = tc;
-		} else if(tf) {
-			tt = tf;
-		} else {
-			// We should never get here!
-			SG_LOG(SG_ATC, SG_ALERT, "ALERT - Logic error in FGTower::ProcessDownwindReport");
-			return;
-		}
-		trns += "Follow the ";
-		string s = tt->plane.callsign;
-		int p = s.find('-');
-		s = s.substr(0,p);
-		trns += s;
-		if((tt->opType) == CIRCUIT) {
-			PatternLeg leg;
-			if(tt->isUser) {
-				leg = tt->leg;
-			}
-			if(leg == FINAL) {
-				trns += " on final";
-			} else if(leg == TURN4) {
-				trns += " turning final";
-			} else if(leg == BASE) {
-				trns += " on base";
-			} else if(leg == TURN3) {
-				trns += " turning base";
-			}
-		} else {
-			double miles_out = CalcDistOutMiles(tt);
-			if(miles_out < 2) {
-				trns += " on short final";
-			} else {
-				trns += " on ";
-				trns += ConvertNumToSpokenDigits((int)miles_out);
-				trns += " mile final";
-			}
-		}
-	}
-	if(_display) {
-		pending_transmission = trns;
-		Transmit();
-	}
-	if(t->isUser) {
-		if(t->opType == TTT_UNKNOWN) t->opType = CIRCUIT;
-		//cout << "ADD VACATED A\n";
-		// Put going around at the top (and hence default) since that'll be more desperate,
-		// or put rwy vacated at the top since that'll be more common?
-		//cout << "ident = " << ident << ", adding go-around option\n";
-		current_atcdialog->add_entry(ident, "@CS Going Around", "Report going around", TOWER, USER_REPORT_GOING_AROUND);
-		current_atcdialog->add_entry(ident, "@CS Clear of the runway", "Report runway vacated", TOWER, USER_REPORT_RWY_VACATED);
-	}
-}
-
-void FGTower::ProcessRunwayVacatedReport(TowerPlaneRec* t) {
-	//cout << "Processing rwy vacated...\n";
-	if(t->isUser) current_atcdialog->remove_entry(ident, USER_REPORT_GOING_AROUND, TOWER);
-	string trns = t->plane.callsign;
-	if(separateGround) {
-		trns += " Contact ground on ";
-		double f = globals->get_ATC_mgr()->GetFrequency(ident, GROUND) / 100.0;	
-		char buf[10];
-		sprintf(buf, "%.2f", f);
-		trns += buf;
-		trns += " Good Day";
-	} else {
-		// Cop-out!!
-		trns += " cleared for taxi to general aviation parking";
-	}
-	//cout << "trns = " << trns << '\n';
-	if(_display) {
-		pending_transmission = trns;
-		Transmit();
-	}
-	RemoveFromRwyList(t->plane.callsign);
-	AddToVacatedList(t);
-	// Maybe we should check that the plane really *has* vacated the runway!
-}
-
-// *********** END RESPONSE FUNCTIONS *****************
-
-// Currently this assumes we *are* next on the runway and doesn't check for planes about to land - 
-// this should be done prior to calling this function.
-void FGTower::ClearHoldingPlane(TowerPlaneRec* t) {
-	//cout << "Entering ClearHoldingPlane..." << endl;
-	// Lets Roll !!!!
-	string trns = t->plane.callsign;
-	//if(departed plane < some threshold in time away) {
-	if(0) {		// FIXME
-	//if(timeSinceLastDeparture <= 60.0 && departed == true) {
-		trns += " line up runway " + ConvertRwyNumToSpokenString(activeRwy);
-		t->clearedToLineUp = true;
-	//} else if(arriving plane < some threshold away) {
-	} else if(GetTrafficETA(2) < 150.0 && (timeSinceLastDeparture > 60.0 || departed == false)) {	// Hack - hardwired time
-		trns += " cleared immediate take-off";
-		if(trafficList.size()) {
-			tower_plane_rec_list_iterator trfcItr = trafficList.begin();
-			trfcItr++;	// At the moment the holding plane should be first in trafficList.
-			// Note though that this will break if holding planes aren't put in trafficList in the future.
-			TowerPlaneRec* trfc = *trfcItr;
-			trns += "... traffic is";
-			switch(trfc->plane.type) {
-			case UNKNOWN:
-				break;
-			case GA_SINGLE:
-				trns += " a Cessna";	// TODO - add ability to specify actual plane type somewhere
-				break;
-			case GA_HP_SINGLE:
-				trns += " a Piper";
-				break;
-			case GA_TWIN:
-				trns += " a King-air";
-				break;
-			case GA_JET:
-				trns += " a Learjet";
-				break;
-			case MEDIUM:
-				trns += " a Regional";
-				break;
-			case HEAVY:
-				trns += " a Heavy";
-				break;
-			case MIL_JET:
-				trns += " Military";
-				break;
-			}
-			//if(trfc->opType == STRAIGHT_IN || trfc->opType == TTT_UNKNOWN) {
-			if(trfc->opType == STRAIGHT_IN) {
-				double miles_out = CalcDistOutMiles(trfc);
-				if(miles_out < 2) {
-					trns += " on final";
-				} else {
-					trns += " on ";
-					trns += ConvertNumToSpokenDigits((int)miles_out);
-					trns += " mile final";
-				}
-			} else if(trfc->opType == CIRCUIT) {
-				//cout << "Getting leg of " << trfc->plane.callsign << '\n';
-				switch(trfc->leg) {
-				case FINAL:
-					trns += " on final";
-					break;
-				case TURN4:
-					trns += " turning final";
-					break;
-				case BASE:
-					trns += " on base";
-					break;
-				case TURN3:
-					trns += " turning base";
-					break;
-				case DOWNWIND:
-					trns += " in circuit";	// At the moment the user plane is generally flagged as unknown opType when downwind incase its a downwind departure which means we won't get here.
-					break;
-				// And to eliminate compiler warnings...
-				case TAKEOFF_ROLL: break;
-				case CLIMBOUT:     break;
-				case TURN1:        break;
-				case CROSSWIND:    break;
-				case TURN2:        break;
-				case LANDING_ROLL: break;
-				case LEG_UNKNOWN:  break;
-				}
-			}
-		} else {
-			// By definition there should be some arriving traffic if we're cleared for immediate takeoff
-			SG_LOG(SG_ATC, SG_WARN, "Warning: Departing traffic cleared for *immediate* take-off despite no arriving traffic in FGTower");
-		}
-		t->clearedToTakeOff = true;
-		departed = false;
-		timeSinceLastDeparture = 0.0;
-	} else {
-	//} else if(timeSinceLastDeparture > 60.0 || departed == false) {	// Hack - test for timeSinceLastDeparture should be in lineup block eventually
-		trns += " cleared for take-off";
-		// TODO - add traffic is... ?
-		t->clearedToTakeOff = true;
-		departed = false;
-		timeSinceLastDeparture = 0.0;
-	}
-	if(_display) {
-		pending_transmission = trns;
-		Transmit();
-	}
-	//cout << "Done ClearHoldingPlane " << endl;
-}
-
-
-// ***************************************************************************************
-// ********** Functions to periodically check what the various traffic is doing **********
-
-// Do one plane from the hold list
-void FGTower::CheckHoldList(double dt) {
-	//cout << "Entering CheckHoldList..." << endl;
-	if(!holdList.empty()) {
-		//cout << "*holdListItr = " << *holdListItr << endl;
-		if(holdListItr == holdList.end()) {
-			holdListItr = holdList.begin();
-		}
-		//cout << "*holdListItr = " << *holdListItr << endl;
-		//Process(*holdListItr);
-		TowerPlaneRec* t = *holdListItr;
-		//cout << "t = " << t << endl;
-		if(t->holdShortReported) {
-			// NO-OP - leave it to the response handler.
-		} else {	// not responding to report, but still need to clear if clear
-			if(t->nextOnRwy) {
-				//cout << "departed = " << departed << '\n';
-				//cout << "timeSinceLastDeparture = " << timeSinceLastDeparture << '\n';
-				if(rwyOccupied) {
-					RemoveAllUserDialogOptions();
-					current_atcdialog->add_entry(ident, "@CS Ready for take-off", "Request take-off clearance", TOWER, (int)USER_REQUEST_TAKE_OFF);
-				} else if(timeSinceLastDeparture <= 60.0 && departed == true) {
-					// Do nothing - this is a bit of a hack - should maybe do line up be ready here
-				} else {
-					ClearHoldingPlane(t);
-					t->leg = TAKEOFF_ROLL;
-					rwyList.push_back(t);
-					rwyListItr = rwyList.begin();
-					rwyOccupied = true;
-					holdList.erase(holdListItr);
-					holdListItr = holdList.begin();
-					if (holdList.empty())
-					  return;
-				}
-			}
-			// TODO - rationalise the considerable code duplication above!
-		}
-		++holdListItr;
-	}
-	//cout << "Done CheckHoldList" << endl;
-}
-
-// do the ciruit list
-void FGTower::CheckCircuitList(double dt) {
-	//cout << "Entering CheckCircuitList..." << endl;
-	// Clear the constraints - we recalculate here.
-	base_leg_pos = 0.0;
-	downwind_leg_pos = 0.0;
-	crosswind_leg_pos = 0.0;
-	
-	if(!circuitList.empty()) {	// Do one plane from the circuit
-		if(circuitListItr == circuitList.end()) {
-			circuitListItr = circuitList.begin();
-		}
-		TowerPlaneRec* t = *circuitListItr;
-		//cout << ident <<  ' ' << circuitList.size() << ' ' << t->plane.callsign << " " << t->leg << " eta " << t->eta << '\n';
-		if(t->isUser) {
-			t->pos.setLongitudeDeg(user_lon_node->getDoubleValue());
-			t->pos.setLatitudeDeg(user_lat_node->getDoubleValue());
-			t->pos.setElevationM(user_elev_node->getDoubleValue());
-			//cout << ident <<  ' ' << circuitList.size() << ' ' << t->plane.callsign << " " << t->leg << " eta " << t->eta << '\n';
-		}
-		SGVec3d tortho = ortho.ConvertToLocal(t->pos);
-		if(t->isUser) {
-			// Need to figure out which leg he's on
-			//cout << "rwy.hdg = " << rwy.hdg << " user hdg = " << user_hdg_node->getDoubleValue();
-			double ho = GetAngleDiff_deg(user_hdg_node->getDoubleValue(), rwy.hdg);
-			//cout << " ho = " << ho << " abs(ho = " << abs(ho) << '\n';
-			// TODO FIXME - get the wind and convert this to track, or otherwise use track somehow!!!
-			// If it's gusty might need to filter the value, although we are leaving 30 degrees each way leeway!
-			if(fabs(ho) < 30) {
-				// could be either takeoff, climbout or landing - check orthopos.y
-				//cout << "tortho.y = " << tortho.y() << '\n';
-				if((tortho.y() < 0) || (t->leg == TURN4) || (t->leg == FINAL)) {
-					t->leg = FINAL;
-					//cout << "Final\n";
-				} else {
-					t->leg = CLIMBOUT;	// TODO - check elev wrt. apt elev to differentiate takeoff roll and climbout
-					//cout << "Climbout\n";
-					// If it's the user we may be unsure of his/her intentions.
-					// (Hopefully the AI planes won't try confusing the sim!!!)
-					//cout << "tortho.y = " << tortho.y() << '\n';
-					if(t->opType == TTT_UNKNOWN) {
-						if(tortho.y() > 5000) {
-							// 5 km out from threshold - assume it's a departure
-							t->opType = OUTBOUND;	// TODO - could check if the user has climbed significantly above circuit altitude as well.
-							// Since we are unknown operation we should be in depList already.
-							//cout << ident << " Removing user from circuitList (TTT_UNKNOWN)\n";
-							circuitListItr = circuitList.erase(circuitListItr);
-							RemoveFromTrafficList(t->plane.callsign);
-							if (circuitList.empty())
-							    return;
-						}
-					} else if(t->opType == CIRCUIT) {
-						if(tortho.y() > 10000) {
-							// 10 km out - assume the user has abandoned the circuit!!
-							t->opType = OUTBOUND;
-							depList.push_back(t);
-							depListItr = depList.begin();
-							//cout << ident << " removing user from circuitList (CIRCUIT)\n";
-							circuitListItr = circuitList.erase(circuitListItr);
-							if (circuitList.empty())
-							  return;
-						}
-					}
-				}
-			} else if(fabs(ho) < 60) {
-				// turn1 or turn 4
-				// TODO - either fix or doublecheck this hack by looking at heading and pattern direction
-				if((t->leg == CLIMBOUT) || (t->leg == TURN1)) {
-					t->leg = TURN1;
-					//cout << "Turn1\n";
-				} else {
-					t->leg = TURN4;
-					//cout << "Turn4\n";
-				}
-			} else if(fabs(ho) < 120) {
-				// crosswind or base
-				// TODO - either fix or doublecheck this hack by looking at heading and pattern direction
-				if((t->leg == TURN1) || (t->leg == CROSSWIND)) {
-					t->leg = CROSSWIND;
-					//cout << "Crosswind\n";
-				} else {
-					t->leg = BASE;
-					//cout << "Base\n";
-				}
-			} else if(fabs(ho) < 150) {
-				// turn2 or turn 3
-				// TODO - either fix or doublecheck this hack by looking at heading and pattern direction
-				if((t->leg == CROSSWIND) || (t->leg == TURN2)) {
-					t->leg = TURN2;
-					//cout << "Turn2\n";
-				} else {
-					t->leg = TURN3;
-					// Probably safe now to assume the user is flying a circuit
-					t->opType = CIRCUIT;
-					//cout << "Turn3\n";
-				}
-			} else {
-				// downwind
-				t->leg = DOWNWIND;
-				//cout << "Downwind\n";
-			}
-			if(t->leg == FINAL) {
-				if(OnActiveRunway(t->pos)) {
-					t->leg = LANDING_ROLL;
-				}
-			}
-		}
-		
-		// Set the constraints IF this is the first plane in the circuit
-		// TODO - at the moment we're constraining plane 2 based on plane 1 - this won't (or might not) work for 3 planes in the circuit!!
-		if(circuitListItr == circuitList.begin()) {
-			switch(t->leg) {
-				case FINAL:
-				// Base leg must be at least as far out as the plane is - actually possibly not necessary for separation, but we'll use that for now.
-				base_leg_pos = tortho.y();
-				//cout << "base_leg_pos = " << base_leg_pos << '\n';
-				break;
-				case TURN4:
-				// Fall through to base
-				case BASE:
-				base_leg_pos = tortho.y();
-				//cout << "base_leg_pos = " << base_leg_pos << '\n';
-				break;
-				case TURN3:
-				// Fall through to downwind
-				case DOWNWIND:
-				// Only have the downwind leg pos as turn-to-base constraint if more negative than we already have.
-				base_leg_pos = (tortho.y() < base_leg_pos ? tortho.y() : base_leg_pos);
-				//cout << "base_leg_pos = " << base_leg_pos;
-				downwind_leg_pos = tortho.x();		// Assume that a following plane can simply be constrained by the immediately in front downwind plane
-				//cout << " downwind_leg_pos = " << downwind_leg_pos << '\n';
-				break;
-				case TURN2:
-				// Fall through to crosswind
-				case CROSSWIND:
-				crosswind_leg_pos = tortho.y();
-				//cout << "crosswind_leg_pos = " << crosswind_leg_pos << '\n';
-				t->instructedToGoAround = false;
-				break;
-				case TURN1:
-				// Fall through to climbout
-				case CLIMBOUT:
-				// Only use current by constraint as largest
-				crosswind_leg_pos = (tortho.y() > crosswind_leg_pos ? tortho.y() : crosswind_leg_pos);
-				//cout << "crosswind_leg_pos = " << crosswind_leg_pos << '\n';
-				break;
-				case TAKEOFF_ROLL:
-				break;
-				case LEG_UNKNOWN:
-				break;
-				case LANDING_ROLL:
-				break;
-				default:
-				break;
-			}
-		}
-		
-		if(t->leg == FINAL && !(t->instructedToGoAround)) {
-			doThresholdETACalc();
-			doThresholdUseOrder();
-			/*
-			if(t->isUser) {
-				cout << "Checking USER on final... ";
-				cout << "eta " << t->eta;
-				if(t->clearedToLand) cout << " cleared to land\n";
-			}
-			*/
-			//cout << "YES FINAL, t->eta = " << t->eta << ", rwyList.size() = " << rwyList.size() << '\n';
-			if(t->landingType == FULL_STOP) {
-				t->opType = INBOUND;
-				//cout << "\n******** SWITCHING TO INBOUND AT POINT AAA *********\n\n";
-			}
-			if(t->eta < 12 && rwyList.size()) {
-				// TODO - need to make this more sophisticated 
-				// eg. is the plane accelerating down the runway taking off [OK],
-				// or stationary near the start [V. BAD!!].
-				// For now this should stop the AI plane landing on top of the user.
-				tower_plane_rec_list_iterator twrItr;
-				twrItr = rwyList.begin();
-				TowerPlaneRec* tpr = *twrItr;
-				if(strcmp(tpr->plane.callsign.c_str(), t->plane.callsign.c_str()) == 0
-						&& rwyList.size() == 1) {
-					// Fixing bug when ATC says that we must go around because of traffic on rwy
-					// but that traffic is our plane! In future we can use this expression
-					// for other ATC-messages like "On ground at 46, vacate left."
-
-				} else {
-					string trns = t->plane.callsign;
-					trns += " GO AROUND TRAFFIC ON RUNWAY I REPEAT GO AROUND";
-					pending_transmission = trns;
-					ImmediateTransmit();
-					t->instructedToGoAround = true;
-					t->clearedToLand = false;
-					// Assume it complies!!!
-					t->opType = CIRCUIT;
-					t->leg = CLIMBOUT;
-				}
-			} else if(!t->clearedToLand) {
-				// The whip through the appList is a hack since currently t->nextOnRwy doesn't always work
-				// TODO - fix this!
-				bool cf = false;
-				for(tower_plane_rec_list_iterator twrItr = appList.begin(); twrItr != appList.end(); twrItr++) {
-					if((*twrItr)->eta < t->eta) {
-						cf = true;
-					}
-				}
-				if(t->nextOnRwy && !cf) {
-					if(!rwyList.size()) {
-						string trns = t->plane.callsign;
-						trns += " Cleared to land";
-						pending_transmission = trns;
-						Transmit();
-						//if(t->isUser) cout << "Transmitting cleared to Land!!!\n";
-						t->clearedToLand = true;
-					}
-				} else {
-					//if(t->isUser) cout << "Not next\n";
-				}
-			}
-		} else if(t->leg == LANDING_ROLL) {
-			//cout << t->plane.callsign << " has landed - adding to rwyList\n";
-			rwyList.push_front(t);
-			// TODO - if(!clearedToLand) shout something!!
-			t->clearedToLand = false;
-			RemoveFromTrafficList(t->plane.callsign);
-			if(t->isUser) {
-				t->opType = TTT_UNKNOWN;
-			}	// TODO - allow the user to specify opType via ATC menu
-			//cout << ident << " Removing " << t->plane.callsign << " from circuitList..." << endl;
-			circuitListItr = circuitList.erase(circuitListItr);
-			if(circuitListItr == circuitList.end() ) {
-				circuitListItr = circuitList.begin();
-				// avoid increment of circuitListItr (would increment to second element, or crash if no element left)
-				return;
-			}
-		}
-		++circuitListItr;
-	}
-	//cout << "Done CheckCircuitList" << endl;
-}
-
-// Do the runway list - we'll do the whole runway list since it's important and there'll never be many planes on the rwy at once!!
-// FIXME - at the moment it looks like we're only doing the first plane from the rwy list.
-// (However, at the moment there should only be one airplane on the rwy at once, until we
-// start allowing planes to line up whilst previous arrival clears the rwy.)
-void FGTower::CheckRunwayList(double dt) {
-	//cout << "Entering CheckRunwayList..." << endl;
-	if(rwyOccupied) {
-		if(!rwyList.size()) {
-			rwyOccupied = false;
-		} else {
-			rwyListItr = rwyList.begin();
-			TowerPlaneRec* t = *rwyListItr;
-			if(t->isUser) {
-				t->pos.setLongitudeDeg(user_lon_node->getDoubleValue());
-				t->pos.setLatitudeDeg(user_lat_node->getDoubleValue());
-				t->pos.setElevationM(user_elev_node->getDoubleValue());
-			}
-			bool on_rwy = OnActiveRunway(t->pos);
-			if(!on_rwy) {
-				// TODO - for all of these we need to check what the user is *actually* doing!
-				if((t->opType == INBOUND) || (t->opType == STRAIGHT_IN)) {
-					//cout << "Tower " << ident << " is removing plane " << t->plane.callsign << " from rwy list (vacated)\n";
-					//cout << "Size of rwylist was " << rwyList.size() << '\n';
-					//cout << "Size of vacatedList was " << vacatedList.size() << '\n';
-					RemoveFromRwyList(t->plane.callsign);
-					AddToVacatedList(t);
-					//cout << "Size of rwylist is " << rwyList.size() << '\n';
-					//cout << "Size of vacatedList is " << vacatedList.size() << '\n';
-					// At the moment we wait until Runway Vacated is reported by the plane before telling to contact ground etc.
-					// It's possible we could be a bit more proactive about this.
-				} else if(t->opType == OUTBOUND) {
-					depList.push_back(t);
-					depListItr = depList.begin();
-					rwyList.pop_front();
-					departed = true;
-					timeSinceLastDeparture = 0.0;
-				} else if(t->opType == CIRCUIT) {
-					//cout << ident << " adding " << t->plane.callsign << " to circuitList" << endl;
-					circuitList.push_back(t);
-					circuitListItr = circuitList.begin();
-					AddToTrafficList(t);
-					rwyList.pop_front();
-					departed = true;
-					timeSinceLastDeparture = 0.0;
-				} else if(t->opType == TTT_UNKNOWN) {
-					depList.push_back(t);
-					depListItr = depList.begin();
-					//cout << ident << " adding " << t->plane.callsign << " to circuitList" << endl;
-					circuitList.push_back(t);
-					circuitListItr = circuitList.begin();
-					AddToTrafficList(t);
-					rwyList.pop_front();
-					departed = true;
-					timeSinceLastDeparture = 0.0;	// TODO - we need to take into account that the user might taxi-in when flagged opType UNKNOWN - check speed/altitude etc to make decision as to what user is up to.
-				} else {
-					// HELP - we shouldn't ever get here!!!
-				}
-			}
-		}
-	}
-	//cout << "Done CheckRunwayList" << endl;
-}
-
-// Do one plane from the approach list
-void FGTower::CheckApproachList(double dt) {
-	//cout << "CheckApproachList called for " << ident << endl;
-	//cout << "AppList.size is " << appList.size() << endl;
-	if(!appList.empty()) {
-		if(appListItr == appList.end()) {
-			appListItr = appList.begin();
-		}
-		TowerPlaneRec* t = *appListItr;
-		//cout << "t = " << t << endl;
-		//cout << "Checking " << t->plane.callsign << endl;
-		if(t->isUser) {
-			t->pos.setLongitudeDeg(user_lon_node->getDoubleValue());
-			t->pos.setLatitudeDeg(user_lat_node->getDoubleValue());
-			t->pos.setElevationM(user_elev_node->getDoubleValue());
-		}
-		doThresholdETACalc();	// We need this here because planes in the lists are not guaranteed to *always* have the correct ETA
-		//cout << "eta is " << t->eta << ", rwy is " << (rwyList.size() ? "occupied " : "clear ") << '\n';
-		SGVec3d tortho = ortho.ConvertToLocal(t->pos);
-		if(t->eta < 12 && rwyList.size() && !(t->instructedToGoAround)) {
-			// TODO - need to make this more sophisticated 
-			// eg. is the plane accelerating down the runway taking off [OK],
-			// or stationary near the start [V. BAD!!].
-			// For now this should stop the AI plane landing on top of the user.
-			tower_plane_rec_list_iterator twrItr;
-			twrItr = rwyList.begin();
-			TowerPlaneRec* tpr = *twrItr;
-			if(strcmp ( tpr->plane.callsign.c_str(), t->plane.callsign.c_str() ) == 0 && rwyList.size() == 1) {
-					// Fixing bug when ATC says that we must go around because of traffic on rwy
-					// but that traffic is we! In future we can use this expression
-					// for other ATC-messages like "On ground at 46, vacate left."
-
-			} else {
-				string trns = t->plane.callsign;
-				trns += " GO AROUND TRAFFIC ON RUNWAY I REPEAT GO AROUND";
-				pending_transmission = trns;
-				ImmediateTransmit();
-				t->instructedToGoAround = true;
-				t->clearedToLand = false;
-				t->nextOnRwy = false;	// But note this is recalculated so don't rely on it
-				// Assume it complies!!!
-				t->opType = CIRCUIT;
-				t->leg = CLIMBOUT;
-				if(t->isUser) {
-					// TODO - add Go-around ack to comm options,
-					// remove report rwy vacated. (possibly).
-				}
-			}
-		} else if(t->isUser && t->eta < 90 && tortho.y() > -2500 && t->clearedToLand && t->gearUpReported == false) {
-			// Check if gear up or down
-			double gp = fgGetFloat("/gear/gear/position-norm");
-			if(gp < 1) {
-				string trnsm = t->plane.callsign;
-				sg_srandom_time();
-				int rnd = int(sg_random() * 2) + 1;
-				if(rnd == 2) {				// Random message for more realistic ATC ;)
-					trnsm += ", LANDING GEAR APPEARS UP!";
-				} else {
-					trnsm += ", Check wheels down and locked.";
-				}
-				pending_transmission = trnsm;
-				ImmediateTransmit();
-				t->gearUpReported = true;
-			}
-		} else if(t->eta < 90 && !t->clearedToLand) {
-			//doThresholdETACalc();
-			doThresholdUseOrder();
-			// The whip through the appList is a hack since currently t->nextOnRwy doesn't always work
-			// TODO - fix this!
-			bool cf = false;
-			for(tower_plane_rec_list_iterator twrItr = appList.begin(); twrItr != appList.end(); twrItr++) {
-				if((*twrItr)->eta < t->eta) {
-					cf = true;
-				}
-			}
-			if(t->nextOnRwy && !cf) {
-				if(!rwyList.size()) {
-					string trns = t->plane.callsign;
-					trns += " Cleared to land";
-					pending_transmission = trns;
-					Transmit();
-					//if(t->isUser) cout << "Transmitting cleared to Land!!!\n";
-					t->clearedToLand = true;
-				}
-			} else {
-				//if(t->isUser) cout << "Not next\n";
-			}
-		}
-		
-		// Check for landing...
-		bool landed = false;
-		if(t->isUser) {
-			if(OnActiveRunway(t->pos)) {
-				landed = true;
-			}
-		}
-		
-		if(landed) {
-			// Duplicated in CheckCircuitList - must be able to rationalise this somehow!
-			//cout << "A " << t->plane.callsign << " has landed, adding to rwyList...\n";
-			rwyList.push_front(t);
-			// TODO - if(!clearedToLand) shout something!!
-			t->clearedToLand = false;
-			RemoveFromTrafficList(t->plane.callsign);
-			//if(t->isUser) {
-				//	t->opType = TTT_UNKNOWN;
-			//}	// TODO - allow the user to specify opType via ATC menu
-			appListItr = appList.erase(appListItr);
-			if(appListItr == appList.end() ) {
-				appListItr = appList.begin();
-			}
-			if (appList.empty())
-			  return;
-
-		}
-		
-		++appListItr;
-	}
-	//cout << "Done" << endl;
-}
-
-// Do one plane from the departure list
-void FGTower::CheckDepartureList(double dt) {
-	if(!depList.empty()) {
-		if(depListItr == depList.end()) {
-			depListItr = depList.begin();
-		}
-		TowerPlaneRec* t = *depListItr;
-		//cout << "Dep list, checking " << t->plane.callsign;
-		
-		double distout;	// meters
-		if(t->isUser) {
-			distout = dclGetHorizontalSeparation(_geod, 
-				SGGeod::fromDegM(user_lon_node->getDoubleValue(), user_lat_node->getDoubleValue(), user_elev_node->getDoubleValue()));
-		}
-		//cout << " distout = " << distout << '\n';
-		if(t->isUser && !(t->clearedToTakeOff)) {	// HACK - we use clearedToTakeOff to check if ATC already contacted with plane (and cleared take-off) or not
-			if(!OnAnyRunway(SGGeod::fromDegM(user_lon_node->getDoubleValue(), user_lat_node->getDoubleValue(), 0.0), false)) {
-				current_atcdialog->remove_entry(ident, USER_REQUEST_TAKE_OFF, TOWER);
-				t->clearedToTakeOff = true;	// FIXME
-			}
-		}
-		if(distout > 10000) {
-			string trns = t->plane.callsign;
-			trns += " You are now clear of my airspace, good day";
-			pending_transmission = trns;
-			Transmit();
-			if(t->isUser) {
-				// Change the communication options
-				RemoveAllUserDialogOptions();
-				//cout << "ADD A\n";
-				current_atcdialog->add_entry(ident, "@AP Tower, @CS @MI miles @CD of the airport for full stop@AT", "Contact tower for VFR arrival (full stop)", TOWER, (int)USER_REQUEST_VFR_ARRIVAL_FULL_STOP);
-			}
-			RemovePlane(t->plane.callsign);
-		} else {
-			++depListItr;
-		}
-	}
-}
-
-// ********** End periodic check functions ***********************************************
-// ***************************************************************************************
-
-
-// Remove all dialog options for this tower.
-void FGTower::RemoveAllUserDialogOptions() {
-	current_atcdialog->remove_entry(ident, USER_REQUEST_VFR_DEPARTURE, TOWER);
-	current_atcdialog->remove_entry(ident, USER_REQUEST_VFR_ARRIVAL, TOWER);
-	current_atcdialog->remove_entry(ident, USER_REQUEST_VFR_ARRIVAL_FULL_STOP, TOWER);
-	current_atcdialog->remove_entry(ident, USER_REQUEST_VFR_ARRIVAL_TOUCH_AND_GO, TOWER);
-	current_atcdialog->remove_entry(ident, USER_REPORT_3_MILE_FINAL, TOWER);
-	current_atcdialog->remove_entry(ident, USER_REPORT_DOWNWIND, TOWER);
-	current_atcdialog->remove_entry(ident, USER_REPORT_RWY_VACATED, TOWER);
-	current_atcdialog->remove_entry(ident, USER_REPORT_GOING_AROUND, TOWER);	
-	current_atcdialog->remove_entry(ident, USER_REQUEST_TAKE_OFF, TOWER);
-}
-
-// Returns true if positions of crosswind/downwind/base leg turns should be constrained by previous traffic
-// plus the constraint position as a rwy orientated orthopos (meters)
-bool FGTower::GetCrosswindConstraint(double& cpos) {
-	if(crosswind_leg_pos != 0.0) {
-		cpos = crosswind_leg_pos;
-		return(true);
-	} else {
-		cpos = 0.0;
-		return(false);
-	}
-}
-bool FGTower::GetDownwindConstraint(double& dpos) {
-	if(fabs(downwind_leg_pos) > nominal_downwind_leg_pos) {
-		dpos = downwind_leg_pos;
-		return(true);
-	} else {
-		dpos = 0.0;
-		return(false);
-	}
-}
-bool FGTower::GetBaseConstraint(double& bpos) {
-	if(base_leg_pos < nominal_base_leg_pos) {
-		bpos = base_leg_pos;
-		return(true);
-	} else {
-		bpos = nominal_base_leg_pos;
-		return(false);
-	}
-}
-
-
-// Figure out which runways are active.
-// For now we'll just be simple and do one active runway - eventually this will get much more complex
-// This is a private function - public interface to the results of this is through GetActiveRunway
-void FGTower::DoRwyDetails() {
-	//cout << "GetRwyDetails called" << endl;
-	
-	// Based on the airport-id and wind get the active runway
-	
-  const FGAirport* apt = fgFindAirportID(ident);
-  if (!apt) {
-    SG_LOG(SG_ATC, SG_WARN, "FGTower::DoRwyDetails: unknown ICAO:" << ident);
-    return;
-  }
-  
-	FGRunway* runway = apt->getActiveRunwayForUsage();
-
-  activeRwy = runway->ident();
-  rwy.rwyID = runway->ident();
-  SG_LOG(SG_ATC, SG_INFO, "In FGGround, active runway for airport " << ident << " is " << activeRwy);
-  
-  // Get the threshold position
-  double other_way = runway->headingDeg() - 180.0;
-  while(other_way <= 0.0) {
-    other_way += 360.0;
-  }
-    // move to the +l end/center of the runway
-  //cout << "Runway center is at " << runway._lon << ", " << runway._lat << '\n';
-  double tshlon = 0.0, tshlat = 0.0, tshr = 0.0;
-  double tolon = 0.0, tolat = 0.0, tor = 0.0;
-  rwy.length = runway->lengthM();
-  geo_direct_wgs_84 ( aptElev, runway->latitude(), runway->longitude(), other_way, 
-                      rwy.length / 2.0 - 25.0, &tshlat, &tshlon, &tshr );
-  geo_direct_wgs_84 ( aptElev, runway->latitude(), runway->longitude(), runway->headingDeg(), 
-                      rwy.length / 2.0 - 25.0, &tolat, &tolon, &tor );
-  
-  // Note - 25 meters in from the runway end is a bit of a hack to put the plane ahead of the user.
-  // now copy what we need out of runway into rwy
-  rwy.threshold_pos = SGGeod::fromDegM(tshlon, tshlat, aptElev);
-  SGGeod takeoff_end = SGGeod::fromDegM(tolon, tolat, aptElev);
-  //cout << "Threshold position = " << tshlon << ", " << tshlat << ", " << aptElev << '\n';
-  //cout << "Takeoff position = " << tolon << ", " << tolat << ", " << aptElev << '\n';
-  rwy.hdg = runway->headingDeg();
-  // Set the projection for the local area based on this active runway
-  ortho.Init(rwy.threshold_pos, rwy.hdg);	
-  rwy.end1ortho = ortho.ConvertToLocal(rwy.threshold_pos);	// should come out as zero
-  rwy.end2ortho = ortho.ConvertToLocal(takeoff_end);
-  
-  // Set the pattern direction
-  // TODO - we'll check for a facilities file with this in eventually - for now assume left traffic except
-  // for certain circumstances (RH parallel rwy).
-  rwy.patternDirection = -1;		// Left
-  if(rwy.rwyID.size() == 3) {
-    rwy.patternDirection = (rwy.rwyID.substr(2,1) == "R" ? 1 : -1);
-  }
-  //cout << "Doing details, rwy.patterDirection is " << rwy.patternDirection << '\n';
-}
-
-
-// Figure out if a given position lies on the active runway
-// Might have to change when we consider more than one active rwy.
-bool FGTower::OnActiveRunway(const SGGeod& pt) {
-	// TODO - check that the centre calculation below isn't confused by displaced thesholds etc.
-	SGVec3d xyc((rwy.end1ortho.x() + rwy.end2ortho.x())/2.0, (rwy.end1ortho.y() + rwy.end2ortho.y())/2.0, 0.0);
-	SGVec3d xyp = ortho.ConvertToLocal(pt);
-	
-	//cout << "Length offset = " << fabs(xyp.y() - xyc.y()) << '\n';
-	//cout << "Width offset = " << fabs(xyp.x() - xyc.x()) << '\n';
-
-	double rlen = rwy.length/2.0 + 5.0;
-	double rwidth = rwy.width/2.0;
-	double ldiff = fabs(xyp.y() - xyc.y());
-	double wdiff = fabs(xyp.x() - xyc.x());
-
-	return((ldiff < rlen) && (wdiff < rwidth));
-}
-
-// Figure out if a given position lies on any runway or not
-// Only call this at startup - reading the runways database is expensive and needs to be fixed!
-bool FGTower::OnAnyRunway(const SGGeod& pt, bool onGround) {
-	ATCData ad;
-	double dist = current_commlist->FindClosest(_geod, ad, TOWER, 7.0);
-	if(dist < 0.0) {
-		return(false);
-	}
-	
-	// Based on the airport-id, go through all the runways and check for a point in them
-
-  const FGAirport* apt = fgFindAirportID(ad.ident);
-  assert(apt);
-  
-  for (unsigned int i=0; i<apt->numRunways(); ++i) {
-    if (OnRunway(pt, apt->getRunwayByIndex(i))) {
-      return true;
-    }
-  }
-
-  // if onGround is true, we only match real runways, so we're done
-  if (onGround) return false;
-
-  // try taxiways as well
-  for (unsigned int i=0; i<apt->numTaxiways(); ++i) {
-    if (OnRunway(pt, apt->getTaxiwayByIndex(i))) {
-      return true;
-    }
-  }
-  
-	return false;
-}
-
-
-// Returns true if successful
-bool FGTower::RemoveFromTrafficList(const string& id) {
-	tower_plane_rec_list_iterator twrItr;
-	for(twrItr = trafficList.begin(); twrItr != trafficList.end(); twrItr++) {
-		TowerPlaneRec* tpr = *twrItr;
-		if(tpr->plane.callsign == id) {
-			trafficList.erase(twrItr);
-			trafficListItr = trafficList.begin();
-			return(true);
-		}
-	}	
-	SG_LOG(SG_ATC, SG_WARN, "Warning - unable to remove aircraft " << id << " from trafficList in FGTower");
-	return(false);
-}
-
-
-// Returns true if successful
-bool FGTower::RemoveFromAppList(const string& id) {
-	tower_plane_rec_list_iterator twrItr;
-	for(twrItr = appList.begin(); twrItr != appList.end(); twrItr++) {
-		TowerPlaneRec* tpr = *twrItr;
-		if(tpr->plane.callsign == id) {
-			appList.erase(twrItr);
-			appListItr = appList.begin();
-			return(true);
-		}
-	}	
-	//SG_LOG(SG_ATC, SG_WARN, "Warning - unable to remove aircraft " << id << " from appList in FGTower");
-	return(false);
-}
-
-// Returns true if successful
-bool FGTower::RemoveFromRwyList(const string& id) {
-	tower_plane_rec_list_iterator twrItr;
-	for(twrItr = rwyList.begin(); twrItr != rwyList.end(); twrItr++) {
-		TowerPlaneRec* tpr = *twrItr;
-		if(tpr->plane.callsign == id) {
-			rwyList.erase(twrItr);
-			rwyListItr = rwyList.begin();
-			return(true);
-		}
-	}	
-	//SG_LOG(SG_ATC, SG_WARN, "Warning - unable to remove aircraft " << id << " from rwyList in FGTower");
-	return(false);
-}
-
-
-// Add a tower plane rec with ETA to the traffic list in the correct position ETA-wise
-// and set nextOnRwy if so.
-// Returns true if this could cause a threshold ETA conflict with other traffic, false otherwise.
-// For planes holding they are put in the first position with time to go, and the return value is
-// true if in the first position (nextOnRwy) and false otherwise.
-// See the comments in FGTower::doThresholdUseOrder for notes on the ordering
-bool FGTower::AddToTrafficList(TowerPlaneRec* t, bool holding) {
-	//cout << "ADD: " << trafficList.size();
-	//cout << "AddToTrafficList called, currently size = " << trafficList.size() << ", holding = " << holding << endl;
-	double separation_time = 90.0;	// seconds - this is currently a guess for light plane separation, and includes a few seconds for a holding plane to taxi onto the rwy.
-	double departure_sep_time = 60.0;	// Separation time behind departing airplanes.  Comments above also apply.
-	bool conflict = false;
-	double lastETA = 0.0;
-	bool firstTime = true;
-	// FIXME - make this more robust for different plane types eg. light following heavy.
-	tower_plane_rec_list_iterator twrItr;
-	//twrItr = trafficList.begin();
-	//while(1) {
-	for(twrItr = trafficList.begin(); twrItr != trafficList.end(); twrItr++) {
-		//if(twrItr == trafficList.end()) {
-		//	cout << "  END  ";
-		//	trafficList.push_back(t);
-		//	return(holding ? firstTime : conflict);
-		//} else {
-			TowerPlaneRec* tpr = *twrItr;
-			if(holding) {
-				//cout << (tpr->isUser ? "USER!\n" : "NOT user\n");
-				//cout << "tpr->eta - lastETA = " << tpr->eta - lastETA << '\n';
-				double dep_allowance = (timeSinceLastDeparture < departure_sep_time ? departure_sep_time - timeSinceLastDeparture : 0.0); 
-				double slot_time = (firstTime ? separation_time + dep_allowance : separation_time + departure_sep_time);
-				// separation_time + departure_sep_time in the above accounts for the fact that the arrival could be touch and go,
-				// and if not needs time to clear the rwy anyway.
-				if(tpr->eta  - lastETA > slot_time) {
-					t->nextOnRwy = firstTime;
-					trafficList.insert(twrItr, t);
-					//cout << "\tH\t" << trafficList.size() << '\n';
-					return(firstTime);
-				}
-				firstTime = false;
-			} else {
-				if(t->eta < tpr->eta) {
-					// Ugg - this one's tricky.
-					// It depends on what the two planes are doing and whether there's a conflict what we do.
-					if(tpr->eta - t->eta > separation_time) {	// No probs, plane 2 can squeeze in before plane 1 with no apparent conflict
-						if(tpr->nextOnRwy) {
-							tpr->nextOnRwy = false;
-							t->nextOnRwy = true;
-						}
-						trafficList.insert(twrItr, t);
-					} else {	// Ooops - this ones tricky - we have a potential conflict!
-						conflict = true;
-						// HACK - just add anyway for now and flag conflict - TODO - FIX THIS using CIRCUIT/STRAIGHT_IN and VFR/IFR precedence rules.
-						if(tpr->nextOnRwy) {
-							tpr->nextOnRwy = false;
-							t->nextOnRwy = true;
-						}
-						trafficList.insert(twrItr, t);
-					}
-					//cout << "\tC\t" << trafficList.size() << '\n';
-					return(conflict);
-				}
-			}
-		//}
-		//++twrItr;
-	}
-	// If we get here we must be at the end of the list, or maybe the list is empty.
-	if(!trafficList.size()) {
-		t->nextOnRwy = true;
-		// conflict and firstTime should be false and true respectively in this case anyway.
-	} else {
-		t->nextOnRwy = false;
-	}
-	trafficList.push_back(t);
-	//cout << "\tE\t" << trafficList.size() << endl;
-	return(holding ? firstTime : conflict);
-}
-
-// Add a tower plane rec with ETA to the circuit list in the correct position ETA-wise
-// Returns true if this might cause a separation conflict (based on ETA) with other traffic, false otherwise.
-// Safe to add a plane that is already in - planes with the same callsign are not added.
-bool FGTower::AddToCircuitList(TowerPlaneRec* t) {
-	if(!t) {
-		//cout << "**********************************************\n";
-		//cout << "AddToCircuitList called with NULL pointer!!!!!\n";
-		//cout << "**********************************************\n";
-		return false;
-	}
-	//cout << "ADD: " << circuitList.size();
-	//cout << ident << " AddToCircuitList called for " << t->plane.callsign << ", currently size = " << circuitList.size() << endl;
-	double separation_time = 60.0;	// seconds - this is currently a guess for light plane separation, and includes a few seconds for a holding plane to taxi onto the rwy.
-	bool conflict = false;
-	tower_plane_rec_list_iterator twrItr;
-	// First check if the plane is already in the list
-	//cout << "A" << endl;
-	//cout << "Checking whether " << t->plane.callsign << " is already in circuit list..." << endl;
-	//cout << "B" << endl;
-	for(twrItr = circuitList.begin(); twrItr != circuitList.end(); twrItr++) {
-		if((*twrItr)->plane.callsign == t->plane.callsign) {
-			//cout << "In list - returning...\n";
-			return false;
-		}
-	}
-	//cout << "Not in list - adding..." << endl;
-	
-	for(twrItr = circuitList.begin(); twrItr != circuitList.end(); twrItr++) {
-		TowerPlaneRec* tpr = *twrItr;
-		//cout << tpr->plane.callsign << " eta is " << tpr->eta << '\n';
-		//cout << "New eta is " << t->eta << '\n';		
-		if(t->eta < tpr->eta) {
-			// Ugg - this one's tricky.
-			// It depends on what the two planes are doing and whether there's a conflict what we do.
-			if(tpr->eta - t->eta > separation_time) {	// No probs, plane 2 can squeeze in before plane 1 with no apparent conflict
-				circuitList.insert(twrItr, t);
-				circuitListItr = circuitList.begin();
-			} else {	// Ooops - this ones tricky - we have a potential conflict!
-				conflict = true;
-				// HACK - just add anyway for now and flag conflict.
-				circuitList.insert(twrItr, t);
-				circuitListItr = circuitList.begin();
-			}
-			//cout << "\tC\t" << circuitList.size() << '\n';
-			return(conflict);
-		}
-	}
-	// If we get here we must be at the end of the list, or maybe the list is empty.
-	//cout << ident << " adding " << t->plane.callsign << " to circuitList" << endl;
-	circuitList.push_back(t);	// TODO - check the separation with the preceding plane for the conflict flag.
-	circuitListItr = circuitList.begin();
-	//cout << "\tE\t" << circuitList.size() << endl;
-	return(conflict);
-}
-
-// Add to vacated list only if not already present
-void FGTower::AddToVacatedList(TowerPlaneRec* t) {
-	tower_plane_rec_list_iterator twrItr;
-	bool found = false;
-	for(twrItr = vacatedList.begin(); twrItr != vacatedList.end(); twrItr++) {
-		if((*twrItr)->plane.callsign == t->plane.callsign) {
-			found = true;
-		}
-	}
-	if(found) return;
-	vacatedList.push_back(t);
-}
-
-void FGTower::AddToHoldingList(TowerPlaneRec* t) {
-	tower_plane_rec_list_iterator it, end = holdList.end();
-	for (it = holdList.begin(); it != end; ++it) {
-		if ((*it)->plane.callsign == t->plane.callsign)
-			return;
-	
-		holdList.push_back(t);
-	}
-}
-
-// Calculate the eta of a plane to the threshold.
-// For ground traffic this is the fastest they can get there.
-// For air traffic this is the middle approximation.
-void FGTower::CalcETA(TowerPlaneRec* tpr, bool printout) {
-	// For now we'll be very crude and hardwire expected speeds to C172-like values
-	// The speeds below are specified in knots IAS and then converted to m/s
-	double app_ias = 100.0 * 0.514444;			// Speed during straight-in approach
-	double circuit_ias = 80.0 * 0.514444;		// Speed around circuit
-	double final_ias = 70.0 * 0.514444;		// Speed during final approach
-	
-	//if(printout) {
-	//cout << "In CalcETA, airplane ident = " << tpr->plane.callsign << '\n';
-	//cout << (tpr->isUser ? "USER\n" : "AI\n");
-	//cout << flush;
-	//}
-	
-	// Sign convention - dist_out is -ve for approaching planes and +ve for departing planes
-	// dist_across is +ve in the pattern direction - ie a plane correctly on downwind will have a +ve dist_across
-	
-	SGVec3d op = ortho.ConvertToLocal(tpr->pos);
-	//if(printout) {
-	//if(!tpr->isUser) cout << "Orthopos is " << op.x() << ", " << op.y() << ' ';
-	//cout << "opType is " << tpr->opType << '\n';
-	//}
-	double dist_out_m = op.y();
-	double dist_across_m = fabs(op.x());	// The fabs is a hack to cope with the fact that we don't know the circuit direction yet
-	//cout << "Doing ETA calc for " << tpr->plane.callsign << '\n';
-	
-	if(tpr->opType == STRAIGHT_IN || tpr->opType == INBOUND) {
-		//cout << "CASE 1\n";
-		double dist_to_go_m = sqrt((dist_out_m * dist_out_m) + (dist_across_m * dist_across_m));
-		if(dist_to_go_m < 1000) {
-			tpr->eta = dist_to_go_m / final_ias;
-		} else {
-			tpr->eta = (1000.0 / final_ias) + ((dist_to_go_m - 1000.0) / app_ias);
-		}
-	} else if(tpr->opType == CIRCUIT || tpr->opType == TTT_UNKNOWN) {	// Hack alert - UNKNOWN has sort of been added here as a temporary hack.
-		//cout << "CASE 2\n";
-		// It's complicated - depends on if base leg is delayed or not
-		//if(printout) {
-		//cout << "Leg = " << tpr->leg << '\n';
-		//}
-		if(tpr->leg == LANDING_ROLL) {
-			tpr->eta = 0;
-		} else if((tpr->leg == FINAL) || (tpr->leg == TURN4)) {
-			//cout << "dist_out_m = " << dist_out_m << '\n';
-			tpr->eta = fabs(dist_out_m) / final_ias;
-		} else if((tpr->leg == BASE) || (tpr->leg == TURN3)) {
-			tpr->eta = (fabs(dist_out_m) / final_ias) + (dist_across_m / circuit_ias);
-		} else {
-			// Need to calculate where base leg is likely to be
-			// FIXME - for now I'll hardwire it to 1000m which is what AILocalTraffic uses!!!
-			// TODO - as a matter of design - AILocalTraffic should get the nominal no-traffic base turn distance from Tower, since in real life the published pattern might differ from airport to airport
-			double nominal_base_dist_out_m = -1000;
-			double current_base_dist_out_m;
-			if(!GetBaseConstraint(current_base_dist_out_m)) {
-				current_base_dist_out_m = nominal_base_dist_out_m;
-			}
-			//cout << "current_base_dist_out_m = " << current_base_dist_out_m << '\n';
-			double nominal_dist_across_m = 1000;	// Hardwired value from AILocalTraffic
-			double current_dist_across_m;
-			if(!GetDownwindConstraint(current_dist_across_m)) {
-				current_dist_across_m = nominal_dist_across_m;
-			}
-			double nominal_cross_dist_out_m = 2000;	// Bit of a guess - AI plane turns to crosswind at 700ft agl.
-			tpr->eta = fabs(current_base_dist_out_m) / final_ias;	// final
-			//cout << "a = " << tpr->eta << '\n';
-			if((tpr->leg == DOWNWIND) || (tpr->leg == TURN2)) {
-				tpr->eta += dist_across_m / circuit_ias;
-				//cout << "b = " << tpr->eta << '\n';
-				tpr->eta += fabs(current_base_dist_out_m - dist_out_m) / circuit_ias;
-				//cout << "c = " << tpr->eta << '\n';
-			} else if((tpr->leg == CROSSWIND) || (tpr->leg == TURN1)) {
-				//cout << "CROSSWIND calc: ";
-				//cout << tpr->eta << ' ';
-				if(dist_across_m > nominal_dist_across_m) {
-					tpr->eta += dist_across_m / circuit_ias;
-					//cout << "a ";
-				} else {
-					tpr->eta += nominal_dist_across_m / circuit_ias;
-					//cout << "b ";
-				}
-				//cout << tpr->eta << ' ';
-				// should we use the dist across of the previous plane if there is previous still on downwind?
-				//if(printout) cout << "bb = " << tpr->eta << '\n';
-				if(dist_out_m > nominal_cross_dist_out_m) {
-					tpr->eta += fabs(current_base_dist_out_m - dist_out_m) / circuit_ias;
-					//cout << "c ";
-				} else {
-					tpr->eta += fabs(current_base_dist_out_m - nominal_cross_dist_out_m) / circuit_ias;
-					//cout << "d ";
-				}
-				//cout << tpr->eta << ' ';
-				//if(printout) cout << "cc = " << tpr->eta << '\n';
-				if(nominal_dist_across_m > dist_across_m) {
-					tpr->eta += (nominal_dist_across_m - dist_across_m) / circuit_ias;
-					//cout << "e ";
-				} else {
-					// Nothing to add
-					//cout << "f ";
-				}
-				//cout << tpr->eta << '\n';
-				//if(printout) cout << "dd = " << tpr->eta << '\n';
-			} else {
-				// We've only just started - why not use a generic estimate?
-				tpr->eta = 240.0;
-			}
-		}
-		//if(printout) {
-		//	cout << "ETA = " << tpr->eta << '\n';
-		//}
-		//if(!tpr->isUser) cout << tpr->plane.callsign << '\t' << tpr->eta << '\n';
-	} else {
-		tpr->eta = 99999;
-	}	
-}
-
-
-// Calculate the distance of a plane to the threshold in meters
-// TODO - Modify to calculate flying distance of a plane in the circuit
-double FGTower::CalcDistOutM(TowerPlaneRec* tpr) {
-	return(dclGetHorizontalSeparation(rwy.threshold_pos, tpr->pos));
-}
-
-
-// Calculate the distance of a plane to the threshold in miles
-// TODO - Modify to calculate flying distance of a plane in the circuit
-double FGTower::CalcDistOutMiles(TowerPlaneRec* tpr) {
-	return(CalcDistOutM(tpr) / 1600.0);		// FIXME - use a proper constant if possible.
-}
-
-
-// Iterate through all the lists, update the position of, and call CalcETA for all the planes.
-void FGTower::doThresholdETACalc() {
-	//cout << "Entering doThresholdETACalc..." << endl;
-	tower_plane_rec_list_iterator twrItr;
-	// Do the approach list first
-	for(twrItr = appList.begin(); twrItr != appList.end(); twrItr++) {
-		TowerPlaneRec* tpr = *twrItr;
-		CalcETA(tpr);
-	}	
-	// Then the circuit list
-	//cout << "Circuit list size is " << circuitList.size() << '\n';
-	for(twrItr = circuitList.begin(); twrItr != circuitList.end(); twrItr++) {
-		TowerPlaneRec* tpr = *twrItr;
-		CalcETA(tpr);
-	}
-	//cout << "Done doThresholdETCCalc" << endl;
-}
-		
-
-// Check that the planes in traffic list are correctly ordered,
-// that the nearest (timewise) is flagged next on rwy, and return
-// true if any threshold use conflicts are detected, false otherwise.
-bool FGTower::doThresholdUseOrder() {
-	//cout << "Entering doThresholdUseOrder..." << endl;
-	bool conflict = false;
-	
-	// Wipe out traffic list, go through circuit, app and hold list, and reorder them in traffic list.
-	// Here's the rather simplistic assumptions we're using:
-	// Currently all planes are assumed to be GA light singles with corresponding speeds and separation times.
-	// In order of priority for runway use:
-	// STRAIGHT_IN > CIRCUIT > HOLDING_FOR_DEPARTURE
-	// No modification of planes speeds occurs - conflicts are resolved by delaying turn for base,
-	// and holding planes until a space.
-	// When calculating if a holding plane can use the runway, time clearance from last departure
-	// as well as time clearance to next arrival must be considered.
-	
-	trafficList.clear();
-	
-	tower_plane_rec_list_iterator twrItr;
-	// Do the approach list first
-	//if(ident == "KRHV") cout << "A" << flush;
-	for(twrItr = appList.begin(); twrItr != appList.end(); twrItr++) {
-		TowerPlaneRec* tpr = *twrItr;
-		//if(ident == "KRHV") cout << tpr->plane.callsign << '\n';
-		conflict = AddToTrafficList(tpr);
-	}	
-	// Then the circuit list
-	//if(ident == "KRHV") cout << "C" << flush;
-	for(twrItr = circuitList.begin(); twrItr != circuitList.end(); twrItr++) {
-		TowerPlaneRec* tpr = *twrItr;
-		//if(ident == "KRHV") cout << tpr->plane.callsign << '\n';
-		conflict = AddToTrafficList(tpr);
-	}
-	// And finally the hold list
-	//cout << "H" << endl;
-	for(twrItr = holdList.begin(); twrItr != holdList.end(); twrItr++) {
-		TowerPlaneRec* tpr = *twrItr;
-		AddToTrafficList(tpr, true);
-	}
-	
-	
-	if(0) {
-	//if(ident == "KRHV") {
-		cout << "T\n";
-		for(twrItr = trafficList.begin(); twrItr != trafficList.end(); twrItr++) {
-			TowerPlaneRec* tpr = *twrItr;
-			cout << tpr->plane.callsign << '\t' << tpr->eta << '\t';
-		}
-		cout << endl;
-	}
-	
-	//cout << "Done doThresholdUseOrder" << endl;
-	return(conflict);
-}
-
-
-// Return the ETA of plane no. list_pos (1-based) in the traffic list.
-// i.e. list_pos = 1 implies next to use runway.
-double FGTower::GetTrafficETA(unsigned int list_pos, bool printout) {
-	if(trafficList.size() < list_pos) {
-		return(99999);
-	}
-
-	tower_plane_rec_list_iterator twrItr;
-	twrItr = trafficList.begin();
-	for(unsigned int i = 1; i < list_pos; i++, twrItr++);
-	TowerPlaneRec* tpr = *twrItr;
-	CalcETA(tpr, printout);
-	//cout << "ETA returned = " << tpr->eta << '\n';
-	return(tpr->eta);
-}
-
-// Contact tower for VFR approach
-// eg "Cessna Charlie Foxtrot Golf Foxtrot Sierra eight miles South of the airport for full stop with Bravo"
-// This function probably only called via user interaction - AI planes will have an overloaded function taking a planerec.
-// opt defaults to AIP_LT_UNKNOWN
-void FGTower::VFRArrivalContact(const string& ID, const LandingType& opt) {
-	//cout << "USER Request Landing Clearance called for ID " << ID << '\n';
-	
-	// For now we'll assume that the user is a light plane and can get him/her to join the circuit if necessary.
-
-	TowerPlaneRec* t;	
-	string usercall = fgGetString("/sim/user/callsign");
-	if(ID == "USER" || ID == usercall) {
-		t = FindPlane(usercall);
-		if(!t) {
-			//cout << "NOT t\n";
-			t = new TowerPlaneRec;
-			t->isUser = true;
-			t->pos.setLongitudeDeg(user_lon_node->getDoubleValue());
-			t->pos.setLatitudeDeg(user_lat_node->getDoubleValue());
-			t->pos.setElevationM(user_elev_node->getDoubleValue());
-		} else {
-			//cout << "IS t\n";
-			// Oops - the plane is already registered with this tower - maybe we took off and flew a giant circuit without
-			// quite getting out of tower airspace - just ignore for now and treat as new arrival.
-			// TODO - Maybe should remove from departure and circuit list if in there though!!
-		}
-	} else {
-		// Oops - something has gone wrong - put out a warning
-		cout << "WARNING - FGTower::VFRContact(string ID, LandingType lt) called with ID " << ID << " which does not appear to be the user.\n";
-		return;
-	}
-		
-	
-	// TODO
-	// Calculate where the plane is in relation to the active runway and it's circuit
-	// and set the op-type as appropriate.
-	
-	// HACK - to get up and running I'm going to assume that the user contacts tower on a staight-in final for now.
-	t->opType = STRAIGHT_IN;
-	
-	t->plane.type = GA_SINGLE;	// FIXME - Another assumption!
-	t->plane.callsign = usercall;
-	CalcETA(t);
-	
-	t->vfrArrivalReported = true;
-	responseReqd = true;
-	
-	appList.push_back(t);	// Not necessarily permanent
-	appListItr = appList.begin();
-	AddToTrafficList(t);
-	
-	current_atcdialog->remove_entry(ident, USER_REQUEST_VFR_ARRIVAL, TOWER);
-	current_atcdialog->remove_entry(ident, USER_REQUEST_VFR_ARRIVAL_FULL_STOP, TOWER);
-	current_atcdialog->remove_entry(ident, USER_REQUEST_VFR_ARRIVAL_TOUCH_AND_GO, TOWER);
-}
-
-void FGTower::RequestDepartureClearance(const string& ID) {
-	//cout << "Request Departure Clearance called...\n";
-}
-
-void FGTower::RequestTakeOffClearance(const string& ID) {
-	string uid=ID;
-	if(ID == "USER") {
-		uid = fgGetString("/sim/user/callsign");
-		current_atcdialog->remove_entry(ident, USER_REQUEST_TAKE_OFF, TOWER);
-	}
-	TowerPlaneRec* t = FindPlane(uid);
-	if(t) {
-		if(!(t->clearedToTakeOff)) {
-			departed = false;
-			t->lineUpReported=true;
-			responseReqd = true;
-		}
-	}
-	else {
-		SG_LOG(SG_ATC, SG_WARN, "WARNING: Unable to find plane " << ID << " in FGTower::RequestTakeOffClearance(...)");
-	}
-}
-	
-void FGTower::ReportFinal(const string& ID) {
-	//cout << "Report Final Called at tower " << ident << " by plane " << ID << '\n';
-	string uid=ID;
-	if(ID == "USER") {
-		uid = fgGetString("/sim/user/callsign");
-		current_atcdialog->remove_entry(ident, USER_REPORT_3_MILE_FINAL, TOWER);
-	}
-	TowerPlaneRec* t = FindPlane(uid);
-	if(t) {
-		t->finalReported = true;
-		t->finalAcknowledged = false;
-		if(!(t->clearedToLand)) {
-			responseReqd = true;
-		} else {
-			// possibly respond with wind even if already cleared to land?
-			t->finalReported = false;
-			t->finalAcknowledged = true;
-			// HACK!! - prevents next reporting being misinterpreted as this one.
-		}
-	} else {
-		SG_LOG(SG_ATC, SG_WARN, "WARNING: Unable to find plane " << ID << " in FGTower::ReportFinal(...)");
-	}
-}
-
-void FGTower::ReportLongFinal(const string& ID) {
-	string uid=ID;
-	if(ID == "USER") {
-		uid = fgGetString("/sim/user/callsign");
-		current_atcdialog->remove_entry(ident, USER_REPORT_3_MILE_FINAL, TOWER);
-	}
-	TowerPlaneRec* t = FindPlane(uid);
-	if(t) {
-		t->longFinalReported = true;
-		t->longFinalAcknowledged = false;
-		if(!(t->clearedToLand)) {
-			responseReqd = true;
-		} // possibly respond with wind even if already cleared to land?
-	} else {
-		SG_LOG(SG_ATC, SG_WARN, "WARNING: Unable to find plane " << ID << " in FGTower::ReportLongFinal(...)");
-	}
-}
-
-//void FGTower::ReportOuterMarker(string ID);
-//void FGTower::ReportMiddleMarker(string ID);
-//void FGTower::ReportInnerMarker(string ID);
-
-void FGTower::ReportRunwayVacated(const string& ID) {
-	//cout << "Report Runway Vacated Called at tower " << ident << " by plane " << ID << '\n';
-	string uid=ID;
-	if(ID == "USER") {
-		uid = fgGetString("/sim/user/callsign");
-		current_atcdialog->remove_entry(ident, USER_REPORT_RWY_VACATED, TOWER);
-	}
-	TowerPlaneRec* t = FindPlane(uid);
-	if(t) {
-		//cout << "Found it...\n";
-		t->rwyVacatedReported = true;
-		responseReqd = true;
-	} else {
-		SG_LOG(SG_ATC, SG_WARN, "WARNING: Unable to find plane " << ID << " in FGTower::ReportRunwayVacated(...)");
-		SG_LOG(SG_ATC, SG_ALERT, "A WARNING: Unable to find plane " << ID << " in FGTower::ReportRunwayVacated(...)");
-		//cout << "WARNING: Unable to find plane " << ID << " in FGTower::ReportRunwayVacated(...)\n";
-	}
-}
-
-TowerPlaneRec* FGTower::FindPlane(const string& ID) {
-	//cout << "FindPlane called for " << ID << "...\n";
-	tower_plane_rec_list_iterator twrItr;
-	// Do the approach list first
-	for(twrItr = appList.begin(); twrItr != appList.end(); twrItr++) {
-		//cout << "appList callsign is " << (*twrItr)->plane.callsign << '\n';
-		if((*twrItr)->plane.callsign == ID) return(*twrItr);
-	}	
-	// Then the circuit list
-	for(twrItr = circuitList.begin(); twrItr != circuitList.end(); twrItr++) {
-		//cout << "circuitList callsign is " << (*twrItr)->plane.callsign << '\n';
-		if((*twrItr)->plane.callsign == ID) return(*twrItr);
-	}
-	// Then the runway list
-	//cout << "rwyList.size() is " << rwyList.size() << '\n';
-	for(twrItr = rwyList.begin(); twrItr != rwyList.end(); twrItr++) {
-		//cout << "rwyList callsign is " << (*twrItr)->plane.callsign << '\n';
-		if((*twrItr)->plane.callsign == ID) return(*twrItr);
-	}
-	// The hold list
-	for(twrItr = holdList.begin(); twrItr != holdList.end(); twrItr++) {
-		if((*twrItr)->plane.callsign == ID) return(*twrItr);
-	}
-	// And finally the vacated list
-	for(twrItr = vacatedList.begin(); twrItr != vacatedList.end(); twrItr++) {
-		//cout << "vacatedList callsign is " << (*twrItr)->plane.callsign << '\n';
-		if((*twrItr)->plane.callsign == ID) return(*twrItr);
-	}
-	SG_LOG(SG_ATC, SG_WARN, "Unable to find " << ID << " in FGTower::FindPlane(...)");
-	//exit(-1);
-	return(NULL);
-}
-
-void FGTower::RemovePlane(const string& ID) {
-	//cout << ident << " RemovePlane called for " << ID << '\n';
-	// We have to be careful here - we want to erase the plane from all lists it is in,
-	// but we can only delete it once, AT THE END.
-	TowerPlaneRec* t = NULL;
-	tower_plane_rec_list_iterator twrItr;
-	for(twrItr = appList.begin(); twrItr != appList.end();) {
-		if((*twrItr)->plane.callsign == ID) {
-			t = *twrItr;
-			twrItr = appList.erase(twrItr);
-			appListItr = appList.begin();
-			// HACK: aircraft are sometimes more than once in a list, so we need to
-			// remove them all before we can delete the TowerPlaneRec class
-			//break;
-		} else
-                        ++twrItr;
-	}
-	for(twrItr = depList.begin(); twrItr != depList.end();) {
-		if((*twrItr)->plane.callsign == ID) {
-			t = *twrItr;
-			twrItr = depList.erase(twrItr);
-			depListItr = depList.begin();
-		} else
-                        ++twrItr;
-	}
-	for(twrItr = circuitList.begin(); twrItr != circuitList.end();) {
-		if((*twrItr)->plane.callsign == ID) {
-			t = *twrItr;
-			twrItr = circuitList.erase(twrItr);
-			circuitListItr = circuitList.begin();
-                } else
-                        ++twrItr;
-	}
-	for(twrItr = holdList.begin(); twrItr != holdList.end();) {
-		if((*twrItr)->plane.callsign == ID) {
-			t = *twrItr;
-			twrItr = holdList.erase(twrItr);
-			holdListItr = holdList.begin();
-                } else
-                        ++twrItr;
-	}
-	for(twrItr = rwyList.begin(); twrItr != rwyList.end();) {
-		if((*twrItr)->plane.callsign == ID) {
-			t = *twrItr;
-			twrItr = rwyList.erase(twrItr);
-			rwyListItr = rwyList.begin();
-                } else
-                        ++twrItr;
-	}
-	for(twrItr = vacatedList.begin(); twrItr != vacatedList.end();) {
-		if((*twrItr)->plane.callsign == ID) {
-			t = *twrItr;
-			twrItr = vacatedList.erase(twrItr);
-			vacatedListItr = vacatedList.begin();
-                } else
-                        ++twrItr;
-	}
-	for(twrItr = trafficList.begin(); twrItr != trafficList.end();) {
-		if((*twrItr)->plane.callsign == ID) {
-			t = *twrItr;
-			twrItr = trafficList.erase(twrItr);
-			trafficListItr = trafficList.begin();
-                } else
-                        ++twrItr;
-	}
-	// And finally, delete the record.
-	delete t;
-}
-
-void FGTower::ReportDownwind(const string& ID) {
-	//cout << "ReportDownwind(...) called\n";
-	string uid=ID;
-	if(ID == "USER") {
-		uid = fgGetString("/sim/user/callsign");
-		current_atcdialog->remove_entry(ident, USER_REPORT_DOWNWIND, TOWER);
-	}
-	TowerPlaneRec* t = FindPlane(uid);
-	if(t) {
-		t->downwindReported = true;
-		responseReqd = true;
-		// If the plane is in the app list, remove it and put it in the circuit list instead.
-		// Ideally we might want to do this at the 2 mile report prior to 45 deg entry, but at
-		// the moment that would b&gg?r up the constraint position calculations.
-		RemoveFromAppList(ID);
-		t->leg = DOWNWIND;
-		if(t->isUser) {
-			t->pos.setLongitudeDeg(user_lon_node->getDoubleValue());
-			t->pos.setLatitudeDeg(user_lat_node->getDoubleValue());
-			t->pos.setElevationM(user_elev_node->getDoubleValue());
-		}
-		CalcETA(t);
-		AddToCircuitList(t);
-	} else {
-		SG_LOG(SG_ATC, SG_WARN, "WARNING: Unable to find plane " << ID << " in FGTower::ReportDownwind(...)");
-	}
-}
-
-void FGTower::ReportGoingAround(const string& ID) {
-	string uid=ID;
-	if(ID == "USER") {
-		uid = fgGetString("/sim/user/callsign");
-		RemoveAllUserDialogOptions();	// TODO - it would be much more efficient if ATCDialog simply had a clear() function!!!
-		current_atcdialog->add_entry(ident, "@AP Tower, @CS Downwind @RW", "Report Downwind", TOWER, (int)USER_REPORT_DOWNWIND);
-	}
-	TowerPlaneRec* t = FindPlane(uid);
-	if(t) {
-		//t->goAroundReported = true;  // No need to set this until we start responding to it.
-		responseReqd = false;	// might change in the future but for now we'll not distract them during the go-around.
-		// If the plane is in the app list, remove it and put it in the circuit list instead.
-		RemoveFromAppList(ID);
-		t->leg = CLIMBOUT;
-		if(t->isUser) {
-			t->pos.setLongitudeDeg(user_lon_node->getDoubleValue());
-			t->pos.setLatitudeDeg(user_lat_node->getDoubleValue());
-			t->pos.setElevationM(user_elev_node->getDoubleValue());
-		}
-		CalcETA(t);
-		AddToCircuitList(t);
-	} else {
-		SG_LOG(SG_ATC, SG_WARN, "WARNING: Unable to find plane " << ID << " in FGTower::ReportDownwind(...)");
-	}
-}
-
-string FGTower::GenText(const string& m, int c) {
-	const int cmax = 300;
-	//string message;
-	char tag[4];
-	char crej = '@';
-	char mes[cmax];
-	char dum[cmax];
-	//char buf[10];
-	char *pos;
-	int len;
-	//FGTransmission t;
-	string usercall = fgGetString("/sim/user/callsign");
-	TowerPlaneRec* t = FindPlane(responseID);
-	
-	//transmission_list_type     tmissions = transmissionlist_station[station];
-	//transmission_list_iterator current   = tmissions.begin();
-	//transmission_list_iterator last      = tmissions.end();
-	
-	//for ( ; current != last ; ++current ) {
-	//	if ( current->get_code().c1 == code.c1 &&  
-	//		current->get_code().c2 == code.c2 &&
-	//	    current->get_code().c3 == code.c3 ) {
-			
-			//if ( ttext ) message = current->get_transtext();
-			//else message = current->get_menutext();
-			strcpy( &mes[0], m.c_str() ); 
-			
-			// Replace all the '@' parameters with the actual text.
-			int check = 0;	// If mes gets overflowed the while loop can go infinite
-			double gp = fgGetFloat("/gear/gear/position-norm");
-			while ( strchr(&mes[0], crej) != NULL  ) {	// ie. loop until no more occurances of crej ('@') found
-				pos = strchr( &mes[0], crej );
-				memmove(&tag[0], pos, 3);
-				tag[3] = '\0';
-				int i;
-				len = 0;
-				for ( i=0; i<cmax; i++ ) {
-					if ( mes[i] == crej ) {
-						len = i; 
-						break;
-					}
-				}
-				strncpy( &dum[0], &mes[0], len );
-				dum[len] = '\0';
-				
-				if ( strcmp ( tag, "@ST" ) == 0 )
-					//strcat( &dum[0], tpars.station.c_str() );
-					strcat(&dum[0], ident.c_str());
-				else if ( strcmp ( tag, "@AP" ) == 0 )
-					//strcat( &dum[0], tpars.airport.c_str() );
-					strcat(&dum[0], name.c_str());
-				else if ( strcmp ( tag, "@CS" ) == 0 ) 
-					//strcat( &dum[0], tpars.callsign.c_str() );
-					strcat(&dum[0], usercall.c_str());
-				else if ( strcmp ( tag, "@TD" ) == 0 ) {
-					/*
-					if ( tpars.tdir == 1 ) {
-						char buf[] = "left";
-						strcat( &dum[0], &buf[0] );
-					}
-					else {
-						char buf[] = "right";
-						strcat( &dum[0], &buf[0] );
-					}
-					*/
-				}
-				else if ( strcmp ( tag, "@HE" ) == 0 ) {
-					/*
-					char buf[10];
-					sprintf( buf, "%i", (int)(tpars.heading) );
-					strcat( &dum[0], &buf[0] );
-					*/
-				}
-				else if ( strcmp ( tag, "@AT" ) == 0 ) {	// ATIS ID
-					/*
-					char buf[10];
-					sprintf( buf, "%i", (int)(tpars.heading) );
-					strcat( &dum[0], &buf[0] );
-					*/
-					double f = globals->get_ATC_mgr()->GetFrequency(ident, ATIS) / 100.0;
-					if(f) {
-						string atis_id;
-						atis_id = ", information " + GetATISID();
-						strcat( &dum[0], atis_id.c_str() );
-					}
-				}
-				else if ( strcmp ( tag, "@VD" ) == 0 ) {
-					/*
-					if ( tpars.VDir == 1 ) {
-						char buf[] = "Descend and maintain";
-						strcat( &dum[0], &buf[0] );
-					}
-					else if ( tpars.VDir == 2 ) {
-						char buf[] = "Maintain";
-						strcat( &dum[0], &buf[0] );
-					}
-					else if ( tpars.VDir == 3 ) {
-						char buf[] = "Climb and maintain";
-						strcat( &dum[0], &buf[0] );
-					} 
-					*/
-				}
-				else if ( strcmp ( tag, "@AL" ) == 0 ) {
-					/*
-					char buf[10];
-					sprintf( buf, "%i", (int)(tpars.alt) );
-					strcat( &dum[0], &buf[0] );
-					*/
-				}
-				else if ( strcmp ( tag, "@TO" ) == 0 ) {      // Requesting take-off or departure clearance
-					string tmp;
-					if (rwyOccupied) {
-						tmp = "Ready for take-off";
-					} else {
-						if (OnAnyRunway(SGGeod::fromDegM(user_lon_node->getDoubleValue(),
-								user_lat_node->getDoubleValue(), 0.0),true)) {
-							tmp = "Request take-off clearance";
-						} else {
-							tmp = "Request departure clearance";
-						}
-					}
-					strcat(&dum[0], tmp.c_str());
-				}
-				else if ( strcmp ( tag, "@MI" ) == 0 ) {
-					char buf[10];
-					//sprintf( buf, "%3.1f", tpars.miles );
-					int dist_miles = (int)dclGetHorizontalSeparation(_geod, SGGeod::fromDegM(user_lon_node->getDoubleValue(), user_lat_node->getDoubleValue(), user_elev_node->getDoubleValue())) / 1600;
-					sprintf(buf, "%i", dist_miles);
-					strcat( &dum[0], &buf[0] );
-				}
-				else if ( strcmp ( tag, "@FR" ) == 0 ) {
-					/*
-					char buf[10];
-					sprintf( buf, "%6.2f", tpars.freq );
-					strcat( &dum[0], &buf[0] );
-					*/
-				}
-				else if ( strcmp ( tag, "@RW" ) == 0 ) {
-					strcat(&dum[0], ConvertRwyNumToSpokenString(activeRwy).c_str());
-				}
-				else if ( strcmp ( tag, "@GR" ) == 0 ) {	// Gear position (on final)
-					if(t->gearWasUp && gp > 0.99) {
-						strcat(&dum[0], ", gear down, ready to land.");
-					}
-				}
-				else if(strcmp(tag, "@CD") == 0) {	// @CD = compass direction
-					double h = GetHeadingFromTo(_geod, SGGeod::fromDegM(user_lon_node->getDoubleValue(), user_lat_node->getDoubleValue(), user_elev_node->getDoubleValue()));
-					while(h < 0.0) h += 360.0;
-					while(h > 360.0) h -= 360.0;
-					if(h < 22.5 || h > 337.5) {
-						strcat(&dum[0], "North");
-					} else if(h < 67.5) {
-						strcat(&dum[0], "North-East");
-					} else if(h < 112.5) {
-						strcat(&dum[0], "East");
-					} else if(h < 157.5) {
-						strcat(&dum[0], "South-East");
-					} else if(h < 202.5) {
-						strcat(&dum[0], "South");
-					} else if(h < 247.5) {
-						strcat(&dum[0], "South-West");
-					} else if(h < 292.5) {
-						strcat(&dum[0], "West");
-					} else {
-						strcat(&dum[0], "North-West");
-					}
-				} else {
-					cout << "Tag " << tag << " not found" << endl;
-					break;
-				}
-				strcat( &dum[0], &mes[len+3] );
-				strcpy( &mes[0], &dum[0] );
-				
-				++check;
-				if(check > 10) {
-					SG_LOG(SG_ATC, SG_WARN, "WARNING: Possibly endless loop terminated in FGTransmissionlist::gen_text(...)"); 
-					break;
-				}
-			}
-			
-			//cout << mes  << endl;  
-			//break;
-		//}
-	//}
-	return mes[0] ? mes : "No transmission found";
-}
-
-string FGTower::GetWeather() {
-	std::ostringstream msg;
-
-	// wind
-	double hdg = wind_from_hdg->getDoubleValue();
-	double speed = wind_speed_knots->getDoubleValue();
-	if (speed < 1)
-		msg << "wind calm";
-	else
-		msg << "wind " << int(hdg) << " degrees at " << int(speed) << " knots";
-
-	// visibility
-	double visibility = fgGetDouble("/environment/visibility-m");
-	if (visibility < 10000)
-		msg << ", visibility " << int(visibility / 1609) << " miles";
-
-	// pressure / altimeter
-	double pressure = fgGetDouble("/environment/pressure-sea-level-inhg");
-	msg << ", QFE " << fixed << setprecision(2) << pressure << ".";
-
-	return msg.str();
-}
-
-string FGTower::GetATISID() {
-        double tstamp = atof(fgGetString("sim/time/elapsed-sec"));
-        const int minute(60);                   // in SI units
-        int interval = ATIS ? 60*minute : 2*minute;	// AWOS updated frequently
-        int sequence = current_commlist->GetAtisSequence(ident, 
-                              tstamp, interval);
-
-	return GetPhoneticLetter(sequence);  // the sequence letter
-}
-
-ostream& operator << (ostream& os, tower_traffic_type ttt) {
-	switch(ttt) {
-	case(CIRCUIT):      return(os << "CIRCUIT");
-	case(INBOUND):      return(os << "INBOUND");
-	case(OUTBOUND):     return(os << "OUTBOUND");
-	case(TTT_UNKNOWN):  return(os << "UNKNOWN");
-	case(STRAIGHT_IN):  return(os << "STRAIGHT_IN");
-	}
-	return(os << "ERROR - Unknown switch in tower_traffic_type operator << ");
-}
-
-ostream& operator << (ostream& os, PatternLeg pl) {
-	switch(pl) {
-	case(TAKEOFF_ROLL):   return(os << "TAKEOFF ROLL");
-	case(CLIMBOUT):       return(os << "CLIMBOUT");
-	case(TURN1):          return(os << "TURN1");
-	case(CROSSWIND):      return(os << "CROSSWIND");
-	case(TURN2):          return(os << "TURN2");
-	case(DOWNWIND):       return(os << "DOWNWIND");
-	case(TURN3):          return(os << "TURN3");
-	case(BASE):           return(os << "BASE");
-	case(TURN4):          return(os << "TURN4");
-	case(FINAL):          return(os << "FINAL");
-	case(LANDING_ROLL):   return(os << "LANDING ROLL");
-	case(LEG_UNKNOWN):    return(os << "UNKNOWN");
-	}
-	return(os << "ERROR - Unknown switch in PatternLeg operator << ");
-}
-
-
-ostream& operator << (ostream& os, LandingType lt) {
-	switch(lt) {
-	case(FULL_STOP):      return(os << "FULL STOP");
-	case(STOP_AND_GO):    return(os << "STOP AND GO");
-	case(TOUCH_AND_GO):   return(os << "TOUCH AND GO");
-	case(AIP_LT_UNKNOWN): return(os << "UNKNOWN");
-	}
-	return(os << "ERROR - Unknown switch in LandingType operator << ");
-}
-
diff --git a/src/ATCDCL/tower.hxx b/src/ATCDCL/tower.hxx
deleted file mode 100644
index fa7115c0d..000000000
--- a/src/ATCDCL/tower.hxx
+++ /dev/null
@@ -1,374 +0,0 @@
-// FGTower - a class to provide tower control at towered airports.
-//
-// Written by David Luff, started March 2002.
-//
-// Copyright (C) 2002  David C. Luff - david.luff@nottingham.ac.uk
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-#ifndef _FG_TOWER_HXX
-#define _FG_TOWER_HXX
-
-#include <simgear/compiler.h>
-#include <simgear/math/SGMath.hxx>
-#include <simgear/misc/sgstream.hxx>
-
-#include <iosfwd>
-#include <string>
-#include <list>
-
-#include "ATC.hxx"
-#include "ATCProjection.hxx"
-
-class FGATCMgr;
-class FGGround;
-
-//DCL - a complete guess for now.
-#define FG_TOWER_DEFAULT_RANGE 30
-
-enum tower_traffic_type {
-	CIRCUIT,
-	INBOUND,	// CIRCUIT traffic gets changed to INBOUND when on final of the full-stop circuit.
-	OUTBOUND,
-	TTT_UNKNOWN,	// departure, but we don't know if for circuits or leaving properly
-	STRAIGHT_IN
-};
-
-ostream& operator << (ostream& os, tower_traffic_type ttt);
-
-enum PatternLeg {
-	TAKEOFF_ROLL,
-	CLIMBOUT,
-	TURN1,
-	CROSSWIND,
-	TURN2,
-	DOWNWIND,
-	TURN3,
-	BASE,
-	TURN4,
-	FINAL,
-	LANDING_ROLL,
-	LEG_UNKNOWN
-};
-
-ostream& operator << (ostream& os, PatternLeg pl);
-
-enum LandingType {
-	FULL_STOP,
-	STOP_AND_GO,
-	TOUCH_AND_GO,
-	AIP_LT_UNKNOWN
-};
-
-ostream& operator << (ostream& os, LandingType lt);
-
-enum tower_callback_type {
-	USER_REQUEST_VFR_DEPARTURE = 1,
-	USER_REQUEST_VFR_ARRIVAL = 2,
-	USER_REQUEST_VFR_ARRIVAL_FULL_STOP = 3,
-	USER_REQUEST_VFR_ARRIVAL_TOUCH_AND_GO = 4,
-	USER_REPORT_3_MILE_FINAL = 5,
-	USER_REPORT_DOWNWIND = 6,
-	USER_REPORT_RWY_VACATED = 7,
-	USER_REPORT_GOING_AROUND = 8,
-	USER_REQUEST_TAKE_OFF = 9
-};
-
-// TODO - need some differentiation of IFR and VFR traffic in order to give the former priority.
-
-// Structure for holding details of a plane under tower control.
-// Not fixed yet - may include more stuff later.
-class TowerPlaneRec {
-	
-public:
-	
-	TowerPlaneRec();
-	TowerPlaneRec(const PlaneRec& p);
-	TowerPlaneRec(const SGGeod& pt);
-	TowerPlaneRec(const PlaneRec& p, const SGGeod& pt);
-	
-	PlaneRec plane;
-	
-	SGGeod pos;
-	double eta;		// seconds
-	double dist_out;	// meters from theshold
-	bool clearedToLand;
-	bool clearedToLineUp;
-	bool clearedToTakeOff;
-	// ought to add time cleared to depart so we can nag if necessary
-	bool holdShortReported;
-	bool lineUpReported;
-	bool downwindReported;
-	bool longFinalReported;
-	bool longFinalAcknowledged;
-	bool finalReported;
-	bool finalAcknowledged;
-	bool rwyVacatedReported;
-	bool rwyVacatedAcknowledged;
-	bool goAroundReported;		// set true if plane informs tower that it's going around.
-	bool instructedToGoAround;	// set true if plane told by tower to go around.
-	bool onRwy;		// is physically on the runway
-	bool nextOnRwy;		// currently projected by tower to be the next on the runway
-	bool gearWasUp;          // Tell to ATC about gear
-	bool gearUpReported;     // Tell to pilot about landing gear
-	
-	bool vfrArrivalReported;
-	bool vfrArrivalAcknowledged;
-
-	// Type of operation the plane is doing
-	tower_traffic_type opType;
-	
-	// Whereabouts in circuit if doing circuits
-	PatternLeg leg;
-	
-	LandingType landingType;
-	bool isUser;	// true if this plane is the user
-};
-
-
-typedef std::list < TowerPlaneRec* > tower_plane_rec_list_type;
-typedef tower_plane_rec_list_type::iterator tower_plane_rec_list_iterator;
-typedef tower_plane_rec_list_type::const_iterator tower_plane_rec_list_const_iterator;
-
-
-class FGTower : public FGATC {
-
-public:
-	
-	FGTower();
-	~FGTower();
-	
-	void Init();
-	
-	void Update(double dt);
-	
-	void ReceiveUserCallback(int code);
-
-	// Contact tower for VFR approach
-	// eg "Cessna Charlie Foxtrot Golf Foxtrot Sierra eight miles South of the airport for full stop with Bravo"
-	// This function probably only called via user interaction - AI planes will have an overloaded function taking a planerec.
-	void VFRArrivalContact(const std::string& ID, const LandingType& opt = AIP_LT_UNKNOWN);
-	
-	void RequestDepartureClearance(const std::string& ID);
-	void RequestTakeOffClearance(const std::string& ID);
-	void ReportFinal(const std::string& ID);
-	void ReportLongFinal(const std::string& ID);
-	void ReportOuterMarker(const std::string& ID);
-	void ReportMiddleMarker(const std::string& ID);
-	void ReportInnerMarker(const std::string& ID);
-	void ReportRunwayVacated(const std::string& ID);
-	void ReportReadyForDeparture(const std::string& ID);
-	void ReportDownwind(const std::string& ID);
-	void ReportGoingAround(const std::string& ID);
-	
-	// Public interface to the active runway - this will get more complex 
-	// in the future and consider multi-runway use, airplane weight etc.
-	inline const std::string& GetActiveRunway() const { return activeRwy; }
-	inline const RunwayDetails& GetActiveRunwayDetails() const { return rwy; }
-	// Get the pattern direction of the active rwy.
-	inline int GetPatternDirection() const { return rwy.patternDirection; }
-	
-	inline const std::string& get_trans_ident() const { return trans_ident; }
-	
-	inline FGGround* const GetGroundPtr() const { return ground; }
-	
-	// Returns true if positions of crosswind/downwind/base leg turns should be constrained by previous traffic
-	// plus the constraint position as a rwy orientated orthopos (meters)
-	bool GetCrosswindConstraint(double& cpos);
-	bool GetDownwindConstraint(double& dpos);
-	bool GetBaseConstraint(double& bpos);
-	
-	std::string GenText(const std::string& m, int c);
-	std::string GetWeather();
-	std::string GetATISID();
-
-private:
-	FGATCMgr* ATCmgr;
-	// This is purely for synactic convienience to avoid writing globals->get_ATC_mgr()-> all through the code!
-	
-	// Respond to a transmission
-	void Respond();
-	
-	void ProcessRunwayVacatedReport(TowerPlaneRec* t);
-	void ProcessDownwindReport(TowerPlaneRec* t);
-	
-	// Remove all options from the user dialog choice
-	void RemoveAllUserDialogOptions();
-	
-	// Periodic checks on the various traffic.
-	void CheckHoldList(double dt);
-	void CheckCircuitList(double dt);
-	void CheckRunwayList(double dt);
-	void CheckApproachList(double dt);
-	void CheckDepartureList(double dt);
-	
-	// Currently this assumes we *are* next on the runway and doesn't check for planes about to land - 
-	// this should be done prior to calling this function.
-	void ClearHoldingPlane(TowerPlaneRec* t);
-	
-	// Find a pointer to plane of callsign ID within the internal data structures
-	TowerPlaneRec* FindPlane(const std::string& ID);
-	
-	// Remove and delete all instances of a plane with a given ID
-	void RemovePlane(const std::string& ID);
-	
-	// Figure out if a given position lies on the active runway
-	// Might have to change when we consider more than one active rwy.
-	bool OnActiveRunway(const SGGeod& pt);
-	
-	// Figure out if a given position lies on a runway or not
-	bool OnAnyRunway(const SGGeod& pt, bool onGround);
-	
-	// Calculate the eta of a plane to the threshold.
-	// For ground traffic this is the fastest they can get there.
-	// For air traffic this is the middle approximation.
-	void CalcETA(TowerPlaneRec* tpr, bool printout = false);
-	
-	// Iterate through all the std::lists and call CalcETA for all the planes.
-	void doThresholdETACalc();
-	
-	// Order the std::list of traffic as per expected threshold use and flag any conflicts
-	bool doThresholdUseOrder();
-	
-	// Calculate the crow-flys distance of a plane to the threshold in meters
-	double CalcDistOutM(TowerPlaneRec* tpr);
-
-	// Calculate the crow-flys distance of a plane to the threshold in miles
-	double CalcDistOutMiles(TowerPlaneRec* tpr);
-	
-	/*
-	void doCommunication();
-	*/
-	
-	void IssueLandingClearance(TowerPlaneRec* tpr);
-	void IssueGoAround(TowerPlaneRec* tpr);
-	void IssueDepartureClearance(TowerPlaneRec* tpr);
-	
-	unsigned int update_count;	// Convienince counter for speading computational load over several updates
-	unsigned int update_count_max;	// ditto.
-	
-	double timeSinceLastDeparture;	// Time in seconds since last departure from active rwy.
-	bool departed;	// set true when the above needs incrementing with time, false when it doesn't.
-	
-	// environment - need to make sure we're getting the surface winds and not winds aloft.
-	SGPropertyNode_ptr wind_from_hdg;	//degrees
-	SGPropertyNode_ptr wind_speed_knots;		//knots
-	
-	double aptElev;		// Airport elevation
-	std::string activeRwy;	// Active runway number - For now we'll disregard multiple / alternate runway operation.
-	RunwayDetails rwy;	// Assumed to be the active one for now.
-	bool rwyOccupied;	// Active runway occupied flag.  For now we'll disregard land-and-hold-short operations.
-	FGATCAlignedProjection ortho;	// Orthogonal mapping of the local area with the active runway threshold at the origin
-	FGATCAlignedProjection ortho_temp;	// Ortho for any runway (needed to get plane position in airport)
-	
-	// Figure out which runways are active.
-	// For now we'll just be simple and do one active runway - eventually this will get much more complex
-	// This is a private function - public interface to the results of this is through GetActiveRunway
-	void DoRwyDetails();
-	
-	// Need a data structure to hold details of the various active planes
-	// or possibly another data structure with the positions of the inactive planes.
-	// Need a data structure to hold outstanding communications from aircraft.
-	
-	// Linked-list of planes on approach to active rwy ordered with nearest first (timewise).
-	// Includes planes that have landed but not yet vacated runway.
-	// Somewhat analagous to the paper strips used (used to be used?) in real life.
-	// Doesn't include planes in circuit until they turn onto base/final?
-	// TODO - may need to alter this for operation to more than one active rwy.
-	tower_plane_rec_list_type appList;
-	tower_plane_rec_list_iterator appListItr;
-
-	// What should we do with planes approaching the airport to join the circuit somewhere
-	// but not on straight-in though? - put them in here for now.	
-	tower_plane_rec_list_type circuitAppList;
-	tower_plane_rec_list_iterator circuitAppListItr;
-	
-	// List of departed planes (planes doing circuits go into circuitList not depList after departure)
-	tower_plane_rec_list_type depList;
-	tower_plane_rec_list_iterator depListItr;
-	
-	// List of planes in the circuit (ordered by nearest to landing first)
-	tower_plane_rec_list_type circuitList;
-	tower_plane_rec_list_iterator circuitListItr;
-	
-	// List of planes waiting to depart
-	tower_plane_rec_list_type holdList;
-	tower_plane_rec_list_iterator holdListItr;
-		
-	// List of planes on rwy
-	tower_plane_rec_list_type rwyList;
-	tower_plane_rec_list_iterator rwyListItr;
-
-	// List of all planes due to use a given rwy arranged in projected order of rwy use
-	tower_plane_rec_list_type trafficList;	// TODO - needs to be expandable to more than one rwy
-	tower_plane_rec_list_iterator trafficListItr;
-	
-	// List of planes that have vacated the runway inbound but not yet handed off to ground
-	tower_plane_rec_list_type vacatedList;
-	tower_plane_rec_list_iterator vacatedListItr;
-	
-	// Returns true if successful
-        bool RemoveFromTrafficList(const std::string& id);
-	bool RemoveFromAppList(const std::string& id);
-	bool RemoveFromRwyList(const std::string& id);
-	
-	// Return the ETA of plane no. list_pos (1-based) in the traffic list.
-	// i.e. list_pos = 1 implies next to use runway.
-	double GetTrafficETA(unsigned int list_pos, bool printout = false);
-	
-	// Add a tower plane rec with ETA to the traffic list in the correct position ETA-wise.
-	// Returns true if this could cause a threshold ETA conflict with other traffic, false otherwise.
-	bool AddToTrafficList(TowerPlaneRec* t, bool holding = false);
-	
-	bool AddToCircuitList(TowerPlaneRec* t);
-	
-	// Add to vacated list only if not already present
-	void AddToVacatedList(TowerPlaneRec* t);
-	
-	void AddToHoldingList(TowerPlaneRec* t);
-
-	// Ground can be separate or handled by tower in real life.
-	// In the program we will always use a separate FGGround class, but we need to know
-	// whether it is supposed to be separate or not to give the correct instructions.
-	bool separateGround;	// true if ground control is separate
-	FGGround* ground;	// The ground control associated with this airport.
-	
-	bool _departureControlled;	// true if we need to hand off departing traffic to departure control
-	//FGDeparture* _departure;	// The relevant departure control (once we've actually written it!)
-	
-	// for failure modeling
-	std::string trans_ident;		// transmitted ident
-	bool tower_failed;		// tower failed?
-	
-	// Pointers to current users position and orientation
-	SGPropertyNode_ptr user_lon_node;
-	SGPropertyNode_ptr user_lat_node;
-	SGPropertyNode_ptr user_elev_node;
-	SGPropertyNode_ptr user_hdg_node;
-	
-	// Details of the general traffic flow etc in the circuit
-	double crosswind_leg_pos;	// Distance from threshold crosswind leg is being turned to in meters (actual operation - *not* ideal circuit)
-	double downwind_leg_pos;	// Actual offset distance in meters from the runway that planes are flying the downwind leg
-	// Currently not sure whether the above should be always +ve or just take the natural orthopos sign (+ve for RH circuit, -ve for LH).
-	double base_leg_pos;		// Actual offset distance from the threshold (-ve) that planes are turning to base leg.
-	
-	double nominal_crosswind_leg_pos;
-	double nominal_downwind_leg_pos;
-	double nominal_base_leg_pos;
-	
-        friend std::istream& operator>> ( std::istream&, FGTower& );
-};
-
-#endif  //_FG_TOWER_HXX