diff --git a/index.js b/index.js
index 8fc987c..72bbea6 100644
--- a/index.js
+++ b/index.js
@@ -28,12 +28,31 @@ const types  = {
   raymarineN2K: require('./raymarinen2k')
 }
 
+const apData = {
+  options: {
+    states: [
+      {name: 'auto', engaged: true},
+      {name: 'wind', engaged: true},
+      {name: 'route', engaged: true},
+      {name: 'standby', engaged: false}
+    ],
+    modes: ['auto', 'wind', 'route']
+  },
+  mode: null,
+  state: null,
+  engaged: false,
+  target: null
+}
+
 module.exports = function(app) {
   var plugin = {}
   var onStop = []
   var autopilot
   var pilots = {}
 
+
+  let apType = '' // autopilot type
+
   _.keys(types).forEach( type => {
     const module = types[type]
     //console.log(`${type}: ${module}`)
@@ -47,9 +66,10 @@ module.exports = function(app) {
   })
 
   plugin.start = function(props) {
-
+    apType= props.type
     autopilot = pilots[props.type]
     autopilot.start(props)
+    app.debug('autopilot.id:', autopilot.id, 'autopilot.type:', apType)
 
     app.registerPutHandler('vessels.self',
                            state_path,
@@ -108,6 +128,8 @@ module.exports = function(app) {
           }
       ]
     })
+
+    registerProvider()
   }
   
   plugin.stop = function() {
@@ -153,5 +175,293 @@ module.exports = function(app) {
     return config
   }
 
+  // Autopilot API - register with Autopilot API
+  const registerProvider = ()=> {
+    app.debug('**** intialise n2k listener *****')
+    app.on('N2KAnalyzerOut', onStreamEvent)
+
+    app.debug('**** registerProvider *****')
+    try {
+      app.registerAutopilotProvider(
+        {
+          getData: async (deviceId) => {
+            return apData
+          },
+          getState: async (deviceId) => {
+            return apData.state
+          },
+          setState: async (
+            state,
+            deviceId
+          ) => {
+            const r = autopilot.putState(undefined, undefined, state, undefined)
+            if (r.state === 'FAILURE') {
+              throw new Error(r.message)
+            }
+          },
+          getMode: async (deviceId) => {
+            return apData.mode
+          },
+          setMode: async (mode, deviceId) => {
+            const r = autopilot.putState(
+              undefined, 
+              undefined, 
+              mode, 
+              undefined
+            )
+            if (r.state === 'FAILURE') {
+              throw new Error(r.message)
+            }
+          },
+          getTarget: async (deviceId) => {
+            return apData.target
+          },
+          setTarget: async (value, deviceId) => {
+            const apState = apData.state
+            if ( apState === 'auto' ) {
+              const r = autopilot.putTargetHeading(undefined, undefined, radiansToDegrees(value), undefined)
+              if (r.state === 'FAILURE') {
+                throw new Error(r.message)
+              }
+            } else if ( apState === 'wind' ) {
+              const r = autopilot.putTargetWind(undefined, undefined, radiansToDegrees(value), undefined)
+              if (r.state === 'FAILURE') {
+                throw new Error(r.message)
+              }
+            }
+            return
+          },
+          adjustTarget: async (
+            value,
+            deviceId
+          ) => {
+            const r = autopilot.putAdjustHeading(undefined, undefined, Math.floor(radiansToDegrees(value)), undefined)
+            if (r.state === 'FAILURE') {
+              throw new Error(r.message)
+            }
+            return
+          },
+          engage: async (deviceId) => {
+            const r = autopilot.putState(undefined, undefined, 'auto', undefined)
+            if (r.state === 'FAILURE') {
+              throw new Error(r.message) 
+            }
+            return
+          },
+          disengage: async (deviceId) => {
+            const r = autopilot.putState(undefined, undefined, 'standby', undefined)
+            if (r.state === 'FAILURE') {
+              throw new Error(r.message)
+            }
+            return
+          },
+          tack: async (
+            direction,
+            deviceId
+          ) => {
+            const r = autopilot.putTack(undefined, undefined, 'direction', undefined)
+            if (r.state === 'FAILURE') { throw new Error(r.message) }
+            return
+          },
+          gybe: async (
+            direction,
+            deviceId
+          ) => {
+            throw new Error('Not implemented!')
+          },
+          dodge: async (
+            direction,
+            deviceId
+          ) => {
+            throw new Error('Not implemented!')
+          }
+        },
+        [apType]
+      )
+    } catch (error) {
+      app.debug(error)
+    }
+  }
+
+  // Autopilot API - parse NMEA2000 stream input
+  const onStreamEvent = (evt) => {
+    // in-scope PGNs
+    const pgns = [
+      65345, 65360, 65379, 
+      65288,
+      127237,
+      126720
+    ]
+   
+    if (!pgns.includes(evt.pgn) || String(evt.src) !== autopilot.id) {
+      return
+    }
+   
+    // 127237 `Heading / Track control (Rudder, etc.)`
+    if (evt.pgn === 127237) { 
+      //app.debug('n2k pgn=', evt.pgn, evt.fields, evt.description)
+    }
+
+    // 65288 = notifications.autopilot.<alarmName>
+    if (evt.pgn === 65288) {
+      if (evt.fields['Manufacturer Code'] !== 'Raymarine'
+        || typeof evt.fields['Alarm Group'] === 'Autopilot'
+        || typeof evt.fields['Alarm Status'] === 'undefined') {
+        return
+      }
+ 
+      const method = [ 'visual' ]
+
+      let state = evt.fields['Alarm Status']
+      if ( state === 'Alarm condition met and not silenced' ) {
+        method.push('sound')
+      }
+
+      if ( state === 'Alarm condition not met' ) {
+        state = 'normal'
+      } else {
+        state = 'alarm'
+      }
+
+      let alarmId = evt.fields['Alarm ID']
+
+      if ( typeof alarmId !== 'string' ) {
+        alarmId = `Unknown Seatalk Alarm ${alarmId}`
+      } else if ( 
+        state === 'alarm' &&
+          ['WP Arrival','Pilot Way Point Advance','Pilot Route Complete'].includes(alarmId)
+        ) {
+        state = 'alert'
+      }
+
+      // normalise alarm name
+      let alarmName = normaliseAlarmId(alarmId)
+      if (!alarmName) {
+        app.debug(`*** Normalise Alarm Failed: ${alarmId}`)
+        return
+      }
+
+      const msg = {
+        message: alarmName,
+        method: method,
+        state: state
+      }
+
+      app.autopilotUpdate(apType, {
+        alarm: {
+          path: alarmName, 
+          value: msg
+        }
+      })
+    }
+
+    // 65345 = 'steering.autopilot.target (windAngleApparent)'
+    if (evt.pgn === 65345) {
+      let angle = evt.fields['Wind Datum'] ? Number(evt.fields['Wind Datum']) : null
+      angle = ( typeof angle === 'number' && angle > Math.PI ) ? angle-(Math.PI*2) : angle
+      apData.target = radiansToDegrees(angle)
+      app.autopilotUpdate(apType, {target: angle})
+    }
+
+    // 65360 = 'steering.autopilot.target (true/magnetic)'
+    if (evt.pgn === 65360) {
+      const targetTrue = evt.fields['Target Heading True'] ? Number(evt.fields['Target Heading True']) : null
+      const targetMagnetic = evt.fields['Target Heading Magnetic'] ? Number(evt.fields['Target Heading Magnetic']) : null
+      const target = typeof targetTrue === 'number' ? targetTrue :
+        typeof targetMagnetic === 'number' ? targetMagnetic: null
+      apData.target = radiansToDegrees(target)
+      app.autopilotUpdate(apType, {target: target})
+    }
+
+    // 126720 ``
+    if (evt.pgn === 126720) { 
+      //app.debug('n2k pgn=', evt.pgn, evt.fields, evt.description)
+    }
+    
+    // 65379 = 'steering.autopilot.state', 'steering.autopilot.engaged'
+    if (evt.pgn === 65379) {
+      //app.debug('n2k pgn=', evt.pgn, evt.fields, evt.description)
+      const mode = typeof evt.fields['Pilot Mode Data']  === 'number' ? evt.fields['Pilot Mode Data'] : null
+      const subMode = typeof evt.fields['Sub Mode']  === 'number' ? evt.fields['Sub Mode'] : null
+      //app.debug(`mode: ${mode}, subMode: ${subMode}`)
+      if ( mode === 0 && subMode === 0 ) {
+        apData.state = 'standby'
+        apData.engaged = false
+        app.autopilotUpdate(apType, {
+          state: apData.state,
+          engaged: false
+        })
+      }
+      else if ( mode == 0 && subMode == 1 ) {
+        apData.mode = 'wind'
+        apData.state = 'wind'
+        apData.engaged = true
+        app.autopilotUpdate(apType, {
+          mode: apData.mode,
+          state: apData.state,
+          engaged: true
+        })
+      }
+      else if ( (mode == 128 || mode == 129) && subMode == 1 ) {
+        apData.mode = 'route'
+        apData.state = 'route'
+        apData.engaged = true
+        app.autopilotUpdate(apType, {
+          mode: apData.mode,
+          state: apData.state,
+          engaged: true
+        })
+      }
+      else if ( mode == 2 && subMode == 0 ) {
+        apData.mode = 'route'
+        apData.state = 'route'
+        apData.engaged = true
+        app.autopilotUpdate(apType, {
+          mode: apData.mode,
+          state: apData.state,
+          engaged: true
+        })
+      }
+      else if ( mode == 64 && subMode == 0 ) {
+        apData.mode = 'auto'
+        apData.state = 'auto'
+        apData.engaged = true
+        app.autopilotUpdate(apType, {
+          mode: apData.mode,
+          state: apData.state,
+          engaged: true
+        })
+      }
+      else {
+        apData.state = 'standby'
+        apData.engaged = false
+        app.autopilotUpdate(apType, {
+          state: apData.state,
+          engaged: false
+        })
+      }
+    }
+
+  }
+
+  // normalise SK alarm path 
+  const normaliseAlarmId = (id) => {
+    switch (id) {
+      case 'WP Arrival':
+        return 'waypointArrival'
+      case 'Pilot Way Point Advance':
+        return 'waypointAdvance'
+      case 'Pilot Route Complete':
+        return 'routeComplete'
+      default:
+        return 'unknown'
+    }
+  }
+
+  const radiansToDegrees = (value) => value * 180 / Math.PI
+  
+  const degreesToRadians = (value) => value * (Math.PI/180.0)
+
+
   return plugin;
 }
diff --git a/raymarinen2k.js b/raymarinen2k.js
index 1944e9e..8a24a53 100644
--- a/raymarinen2k.js
+++ b/raymarinen2k.js
@@ -53,12 +53,14 @@ const everyone_dst = '255'
 
 module.exports = function(app) {
   var deviceid
-  var pilot = {}
+  var pilot = {id: null}
   var timers = []
   var discovered
 
   pilot.start = (props) => {
     deviceid = props.deviceid
+    pilot.id = deviceid
+    app.debug('props.deviceid:', deviceid)
 
     if ( props.controlHead ) {
       timers.push(setInterval(() => {
@@ -187,9 +189,11 @@ module.exports = function(app) {
   }
 
   pilot.properties = () => {
-    let defaultId = '205'
+    let defaultId = deviceid ?? '205'
     let description = 'No EV-1 Found'
 
+    app.debug('***pre-discovery -> defaultId', defaultId)
+
     if ( !discovered ) {
       //let full = app.deltaCache.buildFull(undefined, [ 'sources' ])
       //if ( full && full.sources ) {
@@ -212,6 +216,9 @@ module.exports = function(app) {
       description = `Discovered an EV-1 with id ${discovered}`
       app.debug(description)
     }
+
+    pilot.id = defaultId
+    app.debug('*** post-discovery -> defaultId', defaultId)
       
     return {
       deviceid: {
diff --git a/raystngconv.js b/raystngconv.js
index ef1a1bb..99619c3 100644
--- a/raystngconv.js
+++ b/raystngconv.js
@@ -56,11 +56,13 @@ const everyone_dst = '255'
 
 module.exports = function(app) {
   var deviceid
-  var pilot = {}
+  var pilot = {id: null}
   var discovered
 
   pilot.start = (props) => {
     deviceid = props.converterDeviceId
+    pilot.id = deviceid
+    app.debug('props.converterDeviceId:', deviceid)
   }
 
   pilot.stop = () => {
@@ -171,8 +173,10 @@ module.exports = function(app) {
   }
 
   pilot.properties = () => {
-    let defaultConverterId = '115'
+    let defaultConverterId = deviceid ?? '115'
     let description = 'No SeaTalk-STNG-Converter device found'
+
+    app.debug('***pre-discovery -> defaultConverterId', defaultConverterId)
       
     if ( !discovered ) {
       const sources = app.getPath('/sources')
@@ -190,11 +194,14 @@ module.exports = function(app) {
     }
 
     if ( discovered ) {
-      converterDeviceId = discovered
+      defaultConverterId = discovered
       description = `SeaTalk-STNG-Converter with id ${discovered} discovered`
       app.debug(description)
     }
 
+    pilot.id = defaultConverterId
+    app.debug('*** post-discovery -> defaultConverterId', defaultConverterId)
+
     return {
       converterDeviceId: {
         type: "string",