--- a/pkg/imports/modelconvert.go	Tue Feb 18 13:00:25 2020 +0100
+++ b/pkg/imports/modelconvert.go	Wed Feb 19 15:08:35 2020 +0100
@@ -27,16 +27,16 @@
 	DMVJobKind:    func() interface{} { return new(models.DistanceMarksVirtualImport) },
 	FDJobKind:     func() interface{} { return new(models.FairwayDimensionImport) },
 	DMAJobKind:    func() interface{} { return new(models.DistanceMarksAshoreImport) },
-	BCNLATJobKind: func() interface{} { return new(models.FairwayMarksImport) },
-	BOYCARJobKind: func() interface{} { return new(models.FairwayMarksImport) },
-	BOYLATJobKind: func() interface{} { return new(models.FairwayMarksImport) },
-	BOYSAWJobKind: func() interface{} { return new(models.FairwayMarksImport) },
-	BOYSPPJobKind: func() interface{} { return new(models.FairwayMarksImport) },
-	DAYMARJobKind: func() interface{} { return new(models.FairwayMarksImport) },
-	LIGHTSJobKind: func() interface{} { return new(models.FairwayMarksImport) },
-	RTPBCNJobKind: func() interface{} { return new(models.FairwayMarksImport) },
-	TOPMARJobKind: func() interface{} { return new(models.FairwayMarksImport) },
-	NOTMRKJobKind: func() interface{} { return new(models.FairwayMarksImport) },
+	BCNLATJobKind: func() interface{} { return FindJobCreator(BCNLATJobKind).Create() },
+	BOYCARJobKind: func() interface{} { return FindJobCreator(BOYCARJobKind).Create() },
+	BOYLATJobKind: func() interface{} { return FindJobCreator(BOYLATJobKind).Create() },
+	BOYSAWJobKind: func() interface{} { return FindJobCreator(BOYSAWJobKind).Create() },
+	BOYSPPJobKind: func() interface{} { return FindJobCreator(BOYSPPJobKind).Create() },
+	DAYMARJobKind: func() interface{} { return FindJobCreator(DAYMARJobKind).Create() },
+	LIGHTSJobKind: func() interface{} { return FindJobCreator(LIGHTSJobKind).Create() },
+	RTPBCNJobKind: func() interface{} { return FindJobCreator(RTPBCNJobKind).Create() },
+	TOPMARJobKind: func() interface{} { return FindJobCreator(TOPMARJobKind).Create() },
+	NOTMRKJobKind: func() interface{} { return FindJobCreator(NOTMRKJobKind).Create() },
 	STJobKind:     func() interface{} { return new(models.StretchImport) },
 	SECJobKind:    func() interface{} { return new(models.SectionImport) },
 	DSECJobKind:   func() interface{} { return new(models.SectionDelete) },
@@ -146,116 +146,6 @@
 		}
 	},
 
-	BCNLATJobKind: func(input interface{}) interface{} {
-		fmi := input.(*models.FairwayMarksImport)
-		return &FairwayMarks{
-			URL:         fmi.URL,
-			FeatureType: fmi.FeatureType,
-			SortBy:      nilString(fmi.SortBy),
-			User:        nilString(fmi.User),
-			Password:    nilString(fmi.Password),
-		}
-	},
-
-	BOYCARJobKind: func(input interface{}) interface{} {
-		fmi := input.(*models.FairwayMarksImport)
-		return &FairwayMarks{
-			URL:         fmi.URL,
-			FeatureType: fmi.FeatureType,
-			SortBy:      nilString(fmi.SortBy),
-			User:        nilString(fmi.User),
-			Password:    nilString(fmi.Password),
-		}
-	},
-
-	BOYLATJobKind: func(input interface{}) interface{} {
-		fmi := input.(*models.FairwayMarksImport)
-		return &FairwayMarks{
-			URL:         fmi.URL,
-			FeatureType: fmi.FeatureType,
-			SortBy:      nilString(fmi.SortBy),
-			User:        nilString(fmi.User),
-			Password:    nilString(fmi.Password),
-		}
-	},
-
-	BOYSAWJobKind: func(input interface{}) interface{} {
-		fmi := input.(*models.FairwayMarksImport)
-		return &FairwayMarks{
-			URL:         fmi.URL,
-			FeatureType: fmi.FeatureType,
-			SortBy:      nilString(fmi.SortBy),
-			User:        nilString(fmi.User),
-			Password:    nilString(fmi.Password),
-		}
-	},
-
-	BOYSPPJobKind: func(input interface{}) interface{} {
-		fmi := input.(*models.FairwayMarksImport)
-		return &FairwayMarks{
-			URL:         fmi.URL,
-			FeatureType: fmi.FeatureType,
-			SortBy:      nilString(fmi.SortBy),
-			User:        nilString(fmi.User),
-			Password:    nilString(fmi.Password),
-		}
-	},
-
-	DAYMARJobKind: func(input interface{}) interface{} {
-		fmi := input.(*models.FairwayMarksImport)
-		return &FairwayMarks{
-			URL:         fmi.URL,
-			FeatureType: fmi.FeatureType,
-			SortBy:      nilString(fmi.SortBy),
-			User:        nilString(fmi.User),
-			Password:    nilString(fmi.Password),
-		}
-	},
-
-	LIGHTSJobKind: func(input interface{}) interface{} {
-		fmi := input.(*models.FairwayMarksImport)
-		return &FairwayMarks{
-			URL:         fmi.URL,
-			FeatureType: fmi.FeatureType,
-			SortBy:      nilString(fmi.SortBy),
-			User:        nilString(fmi.User),
-			Password:    nilString(fmi.Password),
-		}
-	},
-
-	RTPBCNJobKind: func(input interface{}) interface{} {
-		fmi := input.(*models.FairwayMarksImport)
-		return &FairwayMarks{
-			URL:         fmi.URL,
-			FeatureType: fmi.FeatureType,
-			SortBy:      nilString(fmi.SortBy),
-			User:        nilString(fmi.User),
-			Password:    nilString(fmi.Password),
-		}
-	},
-
-	TOPMARJobKind: func(input interface{}) interface{} {
-		fmi := input.(*models.FairwayMarksImport)
-		return &FairwayMarks{
-			URL:         fmi.URL,
-			FeatureType: fmi.FeatureType,
-			SortBy:      nilString(fmi.SortBy),
-			User:        nilString(fmi.User),
-			Password:    nilString(fmi.Password),
-		}
-	},
-
-	NOTMRKJobKind: func(input interface{}) interface{} {
-		fmi := input.(*models.FairwayMarksImport)
-		return &FairwayMarks{
-			URL:         fmi.URL,
-			FeatureType: fmi.FeatureType,
-			SortBy:      nilString(fmi.SortBy),
-			User:        nilString(fmi.User),
-			Password:    nilString(fmi.Password),
-		}
-	},
-
 	STJobKind: func(input interface{}) interface{} {
 		sti := input.(*models.StretchImport)
 		return &Stretch{
@@ -316,7 +206,7 @@
 func ConvertToInternal(kind JobKind, src interface{}) interface{} {
 	fn := convertModel[kind]
 	if fn == nil {
-		return nil
+		return src
 	}
 	return fn(src)
 }