diff --git a/api-audit/src/main/java/com/capitalone/dashboard/rest/AuditResultController.java b/api-audit/src/main/java/com/capitalone/dashboard/rest/AuditResultController.java
new file mode 100644
index 0000000000..11f684f685
--- /dev/null
+++ b/api-audit/src/main/java/com/capitalone/dashboard/rest/AuditResultController.java
@@ -0,0 +1,91 @@
+package com.capitalone.dashboard.rest;
+
+import com.capitalone.dashboard.model.AuditResult;
+import com.capitalone.dashboard.model.AuditType;
+import com.capitalone.dashboard.service.AuditResultService;
+import org.bson.types.ObjectId;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.validation.Valid;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+
+@RestController
+public class AuditResultController {
+
+    private final AuditResultService auditResultService;
+
+    @Autowired
+    public AuditResultController(AuditResultService auditResultService) {
+        this.auditResultService = auditResultService;
+    }
+
+    @RequestMapping(value = "/auditresult/dashboard/all/pages", method = GET, produces = APPLICATION_JSON_VALUE)
+    public ResponseEntity<Iterable<AuditResult>> getAuditResultsAll(Pageable pageable) {
+        Iterable<AuditResult> auditResults = auditResultService.getAuditResultsAll(pageable);
+        return ResponseEntity.ok().body(auditResults);
+    }
+
+    @RequestMapping(value = "/auditresult/dashboard/audittype/{auditType}/pages", method = GET, produces = APPLICATION_JSON_VALUE)
+    public ResponseEntity<Iterable<AuditResult>> getAuditResultsByAuditType(@Valid @PathVariable AuditType auditType, Pageable pageable) {
+        Iterable<AuditResult> auditResults = auditResultService.getAuditResultsByAuditType(auditType, pageable);
+        return ResponseEntity.ok().body(auditResults);
+    }
+
+    @RequestMapping(value = "/auditresult/dashboard/title/{title}", method = GET, produces = APPLICATION_JSON_VALUE)
+    public ResponseEntity<Iterable<AuditResult>> getAuditResultsByDBoardTitle(@Valid @PathVariable String title) {
+        Iterable<AuditResult> auditResults = auditResultService.getAuditResultsByDBoardTitle(title);
+        return ResponseEntity.ok().body(auditResults);
+    }
+
+    @RequestMapping(value = "/auditresult/dashboard/title/{title}/audittype/{auditType}", method = GET, produces = APPLICATION_JSON_VALUE)
+    public ResponseEntity<Iterable<AuditResult>> getAuditResultsByDBoardTitleAndAuditType(@Valid @PathVariable String title,
+                                                                                          @Valid @PathVariable AuditType auditType) {
+        Iterable<AuditResult> auditResults = auditResultService.getAuditResultsByDBoardTitleAndAuditType(title, auditType);
+        return ResponseEntity.ok().body(auditResults);
+    }
+
+    @RequestMapping(value = "/auditresult/dashboard/product/{configItemBusServName}/component/{configItemBusAppName}",
+            method = GET, produces = APPLICATION_JSON_VALUE)
+    public ResponseEntity<Iterable<AuditResult>> getAuditResultsByServAndAppNames(@Valid @PathVariable String configItemBusServName,
+                                                                                  @Valid @PathVariable String configItemBusAppName) {
+        Iterable<AuditResult> auditResults = auditResultService.getAuditResultsByServAndAppNames(configItemBusServName,
+                configItemBusAppName);
+        return ResponseEntity.ok().body(auditResults);
+    }
+
+    @RequestMapping(value = "/auditresult/dashboard/product/{configItemBusServName}/component/{configItemBusAppName}/audittype/{auditType}",
+            method = GET, produces = APPLICATION_JSON_VALUE)
+    public ResponseEntity<Iterable<AuditResult>> getAuditResultsByServAndAppNamesAndAuditType(@Valid @PathVariable String configItemBusServName,
+                                                                                              @Valid @PathVariable String configItemBusAppName,
+                                                                                              @Valid @PathVariable AuditType auditType) {
+        Iterable<AuditResult> auditResults = auditResultService.getAuditResultsByServAndAppNamesAndAuditType(configItemBusServName,
+                configItemBusAppName, auditType);
+        return ResponseEntity.ok().body(auditResults);
+    }
+
+    @RequestMapping(value = "/auditresult/lob/{lineOfBusiness}/audittype/{auditType}/pages", method = GET, produces = APPLICATION_JSON_VALUE)
+    public ResponseEntity<Iterable<AuditResult>> getAuditResultsByLineOfBusAndAuditType(@Valid @PathVariable String lineOfBusiness,
+                                                                                        @Valid @PathVariable AuditType auditType, Pageable pageable) {
+        Iterable<AuditResult> auditResults = auditResultService.getAuditResultsByLineOfBusAndAuditType(lineOfBusiness, auditType, pageable);
+        return ResponseEntity.ok().body(auditResults);
+    }
+
+    @RequestMapping(value = "/auditresult/lob/{lineOfBusiness}/pages", method = GET, produces = APPLICATION_JSON_VALUE)
+    public ResponseEntity<Iterable<AuditResult>> getAuditResultsByLineOfBus(@Valid @PathVariable String lineOfBusiness, Pageable pageable) {
+        Iterable<AuditResult> auditResults = auditResultService.getAuditResultsByLineOfBus(lineOfBusiness, pageable);
+        return ResponseEntity.ok().body(auditResults);
+    }
+
+    @RequestMapping(value = "/auditresult/{id}", method = GET, produces = APPLICATION_JSON_VALUE)
+    public ResponseEntity<AuditResult> getAuditResult(@Valid @PathVariable ObjectId id) {
+        AuditResult auditResult = auditResultService.getAuditResult(id);
+        return ResponseEntity.ok().body(auditResult);
+    }
+}
diff --git a/api-audit/src/main/java/com/capitalone/dashboard/service/AuditResultService.java b/api-audit/src/main/java/com/capitalone/dashboard/service/AuditResultService.java
new file mode 100644
index 0000000000..8ab308795b
--- /dev/null
+++ b/api-audit/src/main/java/com/capitalone/dashboard/service/AuditResultService.java
@@ -0,0 +1,28 @@
+package com.capitalone.dashboard.service;
+
+import com.capitalone.dashboard.model.AuditResult;
+import com.capitalone.dashboard.model.AuditType;
+import org.bson.types.ObjectId;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+public interface AuditResultService {
+
+    AuditResult getAuditResult(ObjectId id);
+
+    Page<AuditResult> getAuditResultsAll(Pageable pageable);
+
+    Page<AuditResult> getAuditResultsByAuditType(AuditType auditType, Pageable pageable);
+
+    Iterable<AuditResult> getAuditResultsByDBoardTitle(String title);
+
+    Iterable<AuditResult> getAuditResultsByDBoardTitleAndAuditType(String title, AuditType auditType);
+
+    Iterable<AuditResult> getAuditResultsByServAndAppNames(String configItemBusServName, String configItemBusAppName);
+
+    Iterable<AuditResult> getAuditResultsByServAndAppNamesAndAuditType(String configItemBusServName, String configItemBusAppName, AuditType auditType);
+
+    Page<AuditResult> getAuditResultsByLineOfBusAndAuditType(String lineOfBusiness, AuditType auditType, Pageable pageable);
+
+    Page<AuditResult> getAuditResultsByLineOfBus(String lineOfBusiness, Pageable pageable);
+}
diff --git a/api-audit/src/main/java/com/capitalone/dashboard/service/AuditResultServiceImpl.java b/api-audit/src/main/java/com/capitalone/dashboard/service/AuditResultServiceImpl.java
new file mode 100644
index 0000000000..82ca3fcf96
--- /dev/null
+++ b/api-audit/src/main/java/com/capitalone/dashboard/service/AuditResultServiceImpl.java
@@ -0,0 +1,67 @@
+package com.capitalone.dashboard.service;
+
+import com.capitalone.dashboard.model.AuditResult;
+import com.capitalone.dashboard.model.AuditType;
+import com.capitalone.dashboard.repository.AuditResultRepository;
+import org.bson.types.ObjectId;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Component;
+
+@Component
+public class AuditResultServiceImpl implements AuditResultService{
+
+    @Autowired
+    private AuditResultRepository auditResultRepository;
+
+    @Autowired
+    public AuditResultServiceImpl(AuditResultRepository auditResultRepository){
+        this.auditResultRepository = auditResultRepository;
+    }
+
+    @Override
+    public AuditResult getAuditResult(ObjectId id){
+        return auditResultRepository.findById(id);
+    }
+
+    @Override
+    public Page<AuditResult> getAuditResultsAll(Pageable pageable) {
+        return auditResultRepository.findAll(pageable);
+    }
+
+    @Override
+    public Page<AuditResult> getAuditResultsByAuditType(AuditType auditType, Pageable pageable) {
+        return auditResultRepository.findByAuditType(auditType, pageable);
+    }
+
+    @Override
+    public Iterable<AuditResult> getAuditResultsByDBoardTitle(String dashboardTitle){
+        return auditResultRepository.findByDashboardTitle(dashboardTitle);
+    }
+
+    @Override
+    public Iterable<AuditResult> getAuditResultsByDBoardTitleAndAuditType(String title, AuditType auditType) {
+        return auditResultRepository.findByDashboardTitleAndAuditType(title, auditType);
+    }
+
+    @Override
+    public Iterable<AuditResult> getAuditResultsByServAndAppNames(String configItemBusServName, String configItemBusAppName) {
+        return auditResultRepository.findByConfigItemBusServNameAndConfigItemBusAppName(configItemBusServName, configItemBusAppName);
+    }
+
+    @Override
+    public Iterable<AuditResult> getAuditResultsByServAndAppNamesAndAuditType(String configItemBusServName, String configItemBusAppName, AuditType auditType) {
+        return auditResultRepository.findByConfigItemBusServNameAndConfigItemBusAppNameAndAuditType(configItemBusServName, configItemBusAppName, auditType);
+    }
+
+    @Override
+    public Page<AuditResult> getAuditResultsByLineOfBusAndAuditType(String lineOfBus, AuditType auditType, Pageable pageable) {
+        return auditResultRepository.findByLineOfBusinessAndAuditType(lineOfBus, auditType, pageable);
+    }
+
+    @Override
+    public Page<AuditResult> getAuditResultsByLineOfBus(String lineOfBus, Pageable pageable) {
+        return auditResultRepository.findByLineOfBusiness(lineOfBus, pageable);
+    }
+}
diff --git a/collectors/audit/nfrr/README.md b/collectors/audit/nfrr/README.md
new file mode 100644
index 0000000000..f58d2a1464
--- /dev/null
+++ b/collectors/audit/nfrr/README.md
@@ -0,0 +1 @@
+The README is in the [gh-pages](https://github.com/capitalone/Hygieia/blob/gh-pages/pages/hygieia/collectors/audit/nfrr-audit.md) branch. Please update it there.
diff --git a/collectors/audit/nfrr/docker/Dockerfile b/collectors/audit/nfrr/docker/Dockerfile
new file mode 100644
index 0000000000..f063939b67
--- /dev/null
+++ b/collectors/audit/nfrr/docker/Dockerfile
@@ -0,0 +1,19 @@
+
+FROM docker.io/openjdk:8-jre
+
+MAINTAINER Hygieia@capitalone.com
+
+RUN mkdir /hygieia /hygieia/config
+
+COPY *.jar /hygieia/
+COPY properties-builder.sh /hygieia/
+
+WORKDIR /hygieia
+
+VOLUME ["/hygieia/logs"]
+
+ENV PROP_FILE /hygieia/config/application.properties
+
+CMD ./properties-builder.sh && \
+  java -jar nfrr-audit-collector*.jar --spring.config.location=$PROP_FILE
+
diff --git a/collectors/audit/nfrr/docker/properties-builder.sh b/collectors/audit/nfrr/docker/properties-builder.sh
new file mode 100755
index 0000000000..36bb3b5285
--- /dev/null
+++ b/collectors/audit/nfrr/docker/properties-builder.sh
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+if [ "$SKIP_PROPERTIES_BUILDER" = true ]; then
+  echo "Skipping properties builder"
+  exit 0
+fi
+
+# mongo container provides the HOST/PORT
+# api container provided DB Name, ID & PWD
+
+if [ "$TEST_SCRIPT" != "" ]
+then
+        #for testing locally
+        PROP_FILE=application.properties
+else 
+	PROP_FILE=config/hygieia-nfrr-audit-collector.properties
+fi
+  
+if [ "$MONGO_PORT" != "" ]; then
+	# Sample: MONGO_PORT=tcp://172.17.0.20:27017
+	MONGODB_HOST=`echo $MONGO_PORT|sed 's;.*://\([^:]*\):\(.*\);\1;'`
+	MONGODB_PORT=`echo $MONGO_PORT|sed 's;.*://\([^:]*\):\(.*\);\2;'`
+else
+	env
+	echo "ERROR: MONGO_PORT not defined"
+	exit 1
+fi
+
+echo "MONGODB_HOST: $MONGODB_HOST"
+echo "MONGODB_PORT: $MONGODB_PORT"
+
+cat > $PROP_FILE <<EOF
+#Database Name
+dbname=${HYGIEIA_API_ENV_SPRING_DATA_MONGODB_DATABASE:-dashboarddb}
+
+#Database HostName - default is localhost
+dbhost=${MONGODB_HOST:-10.0.1.1}
+
+#Database Port - default is 27017
+dbport=${MONGODB_PORT:-27017}
+
+#Database Username - default is blank
+dbusername=${HYGIEIA_API_ENV_SPRING_DATA_MONGODB_USERNAME:-dashboarduser}
+
+#Database Password - default is blank
+dbpassword=${HYGIEIA_API_ENV_SPRING_DATA_MONGODB_PASSWORD:-dbpassword}
+
+#Collector schedule (required)
+nfrr.cron=${NFRR_CRON:-0 0/30 * * * *}
+
+# Audit number of days - begin date
+nfrr.days=${NFRR_DAYS:-30}
+
+#nfrr server (required) - Can provide multiple
+#nfrr.servers[0]=http://nfrr.company.com
+#nfrr.environments[0]=[DEV,QA,INT,PERF,PROD]
+#nfrr.apiKeys[0]=abcd1234
+
+EOF
+
+# find how many nfrr urls are configured
+max=$(wc -w <<< "${!NFRR_URL*}")
+
+# loop over and output the url, username, apiKey
+i=0
+while [ $i -lt $max ]
+do
+	if [ $i -eq 0 ]
+	then
+		server="NFRR_URL"
+		username="NFRR_USERNAME"
+		apiKey="NFRR_API_KEY"
+		days="NFRR_DAYS"
+	else
+		server="NFRR_URL$i"
+		username="NFRR_USERNAME$i"
+		apiKey="NFRR_API_KEY$i"
+		days="NFRR_DAYS$i"
+	fi
+	
+cat >> $PROP_FILE <<EOF
+nfrr.servers[${i}]=${!server}
+nfrr.usernames[${i}]=${!username}
+nfrr.apiKeys[${i}]=${!apiKey}
+nfrr.days[${i}]=${!days}
+
+EOF
+	
+	i=$(($i+1))
+done
+
+cat >> $PROP_FILE <<EOF
+#Determines if audit console log is collected - defaults to false
+nfrr.saveLog=${NFRR_SAVE_LOG:-true}
+EOF
+
+echo "
+
+===========================================
+Properties file created `date`:  $PROP_FILE
+Note: passwords & apiKey hidden
+===========================================
+`cat $PROP_FILE |egrep -vi 'password|apiKey'`
+"
+
+exit 0
diff --git a/collectors/audit/nfrr/pom.xml b/collectors/audit/nfrr/pom.xml
new file mode 100644
index 0000000000..1d9a647639
--- /dev/null
+++ b/collectors/audit/nfrr/pom.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<parent>
+    <artifactId>Hygieia</artifactId>
+    <groupId>com.capitalone.dashboard</groupId>
+    <version>3.0.1</version>
+    <relativePath>../../../pom.xml</relativePath>
+</parent>
+<modelVersion>4.0.0</modelVersion>
+
+<name>${project.groupId}:${project.artifactId}</name>
+<description>NFRR Audit Collector</description>
+<url>https://github.com/capitalone/Hygieia</url>
+<packaging>jar</packaging>
+
+
+<artifactId>nfrr-audit-collector</artifactId>
+<version>3.0.1</version>
+
+<properties>
+    <java.version>1.8</java.version>
+</properties>
+
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-maven-plugin</artifactId>
+        </plugin>
+        <plugin>
+            <groupId>com.spotify</groupId>
+            <artifactId>docker-maven-plugin</artifactId>
+            <configuration>
+                <skipDockerBuild>false</skipDockerBuild>
+                <imageName>hygieia-nfrr-audit-collector</imageName>
+                <dockerDirectory>${project.basedir}/docker</dockerDirectory>
+                <resources>
+                    <resource>
+                        <targetPath>/</targetPath>
+                        <directory>${project.build.directory}</directory>
+                        <include>${project.build.finalName}.jar</include>
+                    </resource>
+                </resources>
+            </configuration>
+        </plugin>
+        <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <executions>
+                <execution>
+                    <goals>
+                        <goal>prepare-agent</goal>
+                    </goals>
+                </execution>
+                <execution>
+                    <id>report</id>
+                    <phase>verify</phase>
+                    <goals>
+                        <goal>report</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+    <testResources>
+        <testResource>
+            <directory>src/test/resources</directory>
+        </testResource>
+    </testResources>
+</build>
+
+<dependencies>
+    <dependency>
+        <groupId>com.capitalone.dashboard</groupId>
+        <artifactId>core</artifactId>
+        <version>${project.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>com.googlecode.json-simple</groupId>
+        <artifactId>json-simple</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>2.4</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>3.6</version>
+    </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-web</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-data-mongodb</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-test</artifactId>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <version>1.10.19</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.assertj</groupId>
+        <artifactId>assertj-core</artifactId>
+        <version>3.5.2</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+    </dependency>
+
+
+</dependencies>
+
+
+</project>
\ No newline at end of file
diff --git a/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/Application.java b/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/Application.java
new file mode 100644
index 0000000000..5177c03221
--- /dev/null
+++ b/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/Application.java
@@ -0,0 +1,19 @@
+package com.capitalone.dashboard;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * <h1>AuditStatusCollector</h1>
+ * This application helps to collect audit data
+ * <p>
+ *
+ * @since 09/28/2018
+ */
+@SpringBootApplication
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+}
diff --git a/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/collector/AuditCollector.java b/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/collector/AuditCollector.java
new file mode 100644
index 0000000000..0b0889ff7e
--- /dev/null
+++ b/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/collector/AuditCollector.java
@@ -0,0 +1,28 @@
+package com.capitalone.dashboard.collector;
+
+import com.capitalone.dashboard.model.Collector;
+import com.capitalone.dashboard.model.CollectorType;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AuditCollector extends Collector {
+
+    private List<String> auditServers = new ArrayList<>();
+
+    /**
+    * Audit Collector Instance built with required config settings
+    */
+    public static AuditCollector prototype(List<String> servers) {
+        AuditCollector protoType = new AuditCollector();
+        protoType.setName("AuditCollector");
+        protoType.setCollectorType(CollectorType.Audit);
+        protoType.setOnline(true);
+        protoType.setEnabled(true);
+        protoType.auditServers.addAll(servers);
+        return protoType;
+    }
+    public List<String> getAuditServers() {
+        return auditServers;
+    }
+}
\ No newline at end of file
diff --git a/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/collector/AuditCollectorTask.java b/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/collector/AuditCollectorTask.java
new file mode 100644
index 0000000000..0a1df6df00
--- /dev/null
+++ b/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/collector/AuditCollectorTask.java
@@ -0,0 +1,116 @@
+package com.capitalone.dashboard.collector;
+import com.capitalone.dashboard.model.Dashboard;
+import com.capitalone.dashboard.model.Audit;
+import com.capitalone.dashboard.model.AuditResult;
+import com.capitalone.dashboard.model.AuditType;
+import com.capitalone.dashboard.model.DashboardType;
+
+import com.capitalone.dashboard.repository.DashboardRepository;
+import com.capitalone.dashboard.repository.AuditResultRepository;
+import com.capitalone.dashboard.repository.AuditCollectorRepository;
+import com.capitalone.dashboard.repository.CmdbRepository;
+import com.capitalone.dashboard.repository.BaseCollectorRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.TaskScheduler;
+import org.springframework.stereotype.Component;
+
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <h1>AuditCollectorTask</h1>
+ * This task finds recent dashboards, collect and store audit statuses
+ *
+ * @since 09/28/2018
+ */
+@Component
+public class AuditCollectorTask extends CollectorTask<AuditCollector> {
+
+    private final Logger LOGGER = LoggerFactory.getLogger(AuditCollectorTask.class);
+
+    @Autowired
+    private DashboardRepository dashboardRepository;
+    @Autowired
+    private AuditResultRepository auditResultRepository;
+    @Autowired
+    private AuditCollectorRepository auditCollectorRepository;
+    @Autowired
+    private AuditSettings settings;
+    @Autowired
+    private CmdbRepository cmdbRepository;
+
+    @Autowired
+    public AuditCollectorTask(TaskScheduler taskScheduler, DashboardRepository dashboardRepository,
+                              AuditResultRepository auditResultRepository, AuditCollectorRepository auditCollectorRepository,
+                              AuditSettings settings) {
+        super(taskScheduler, "AuditCollector");
+        this.dashboardRepository = dashboardRepository;
+        this.auditResultRepository = auditResultRepository;
+        this.auditCollectorRepository = auditCollectorRepository;
+        this.settings = settings;
+    }
+
+    public AuditCollectorTask (TaskScheduler taskScheduler) {
+        super(taskScheduler, "AuditCollector");
+    }
+
+    @Override
+    public void collect(AuditCollector collector) {
+        LOGGER.info("NFRR Audit Collector pulls all the team dashboards");
+        Iterable<Dashboard> dashboards = dashboardRepository.findAllByType(DashboardType.Team);
+
+        List<AuditResult> auditResults = getAuditResults(dashboards);
+        if (auditResults.isEmpty()){
+            return;
+        }
+        AuditCollectorUtil.clearAuditResultRepo(auditResultRepository);
+        auditResultRepository.save(auditResults);
+        AuditCollectorUtil.clearAuditResults();
+        LOGGER.info("NFRR Audit Collector executed successfully");
+        }
+
+    /**
+     * Get audit statuses for the dashboards
+     *
+     * @param dashboards
+     */
+    protected List<AuditResult> getAuditResults(Iterable<Dashboard> dashboards) {
+        int numberOfAuditDays = settings.getDays();
+        long auditBeginDateTimeStamp = Instant.now().minus(Duration.ofDays(numberOfAuditDays)).toEpochMilli();
+        long auditEndDateTimeStamp = Instant.now().toEpochMilli();
+        LOGGER.info("NFRR Audit Collector audits with begin,end timestamps as " + auditBeginDateTimeStamp + "," + auditEndDateTimeStamp);
+
+        dashboards.forEach((Dashboard dashboard) -> {
+                Map<AuditType, Audit> auditMap = AuditCollectorUtil.getAudit(dashboard, settings,
+                        auditBeginDateTimeStamp, auditEndDateTimeStamp);
+
+                LOGGER.info("NFRR Audit Collector adding audit results for the dashboard : " + dashboard.getTitle());
+                AuditCollectorUtil.addAuditResultByAuditType(dashboard, auditMap, cmdbRepository, auditEndDateTimeStamp);
+        });
+        return AuditCollectorUtil.getAuditResults();
+    }
+
+    @Override
+    public AuditCollector getCollector() {
+        return AuditCollector.prototype(this.settings.getServers());
+    }
+
+    @Override
+    public BaseCollectorRepository<AuditCollector> getCollectorRepository() {
+        return auditCollectorRepository;
+    }
+
+    /**
+     * This property helps to determine AuditStatus Collector execution interval
+     */
+    @Override
+    public String getCron() {
+        return this.settings.getCron();
+    }
+
+}
diff --git a/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/collector/AuditCollectorUtil.java b/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/collector/AuditCollectorUtil.java
new file mode 100644
index 0000000000..f9b3ee2f32
--- /dev/null
+++ b/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/collector/AuditCollectorUtil.java
@@ -0,0 +1,515 @@
+package com.capitalone.dashboard.collector;
+
+import com.capitalone.dashboard.model.Audit;
+import com.capitalone.dashboard.model.AuditStatus;
+import com.capitalone.dashboard.model.DataStatus;
+import com.capitalone.dashboard.model.AuditType;
+import com.capitalone.dashboard.model.AuditResult;
+import com.capitalone.dashboard.model.Dashboard;
+import com.capitalone.dashboard.model.Cmdb;
+
+import com.capitalone.dashboard.repository.AuditResultRepository;
+import com.capitalone.dashboard.repository.CmdbRepository;
+import com.capitalone.dashboard.status.*;
+import org.apache.http.client.utils.URIBuilder;
+import org.bson.types.ObjectId;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.jmx.MBeanServerNotFoundException;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+/**
+ * <h1>AuditCollectorUtil</h1>
+ * Utility class for NFRR Audit Collector
+ *
+ * @since 10/04/2018
+ */
+public class AuditCollectorUtil {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AuditCollectorUtil.class);
+    private static final String HYGIEIA_AUDIT_URL = "/api-audit/dashboardReview";
+    private static List<AuditResult> auditResults = new ArrayList<>();
+    private static final String AUDITTYPES_PARAM  = "CODE_REVIEW,CODE_QUALITY,STATIC_SECURITY_ANALYSIS,LIBRARY_POLICY,TEST_RESULT,PERF_TEST";
+    private enum AUDIT_PARAMS {title,businessService,businessApplication,beginDate,endDate,auditType};
+
+
+    private static final String STR_URL = "url";
+    private static final String STR_PULLREQUESTS = "pullRequests";
+    private static final String STR_DIRECTCOMMITS = "directCommits";
+    private static final String STR_AUDITSTATUSES = "auditStatuses";
+    private static final String STR_REVIEW = "review";
+    private static final String STR_APIUSER = "apiUser";
+    private static final String STR_APITOKENSPACE = "apiToken ";
+    private static final String STR_AUTHORIZATION = "Authorization";
+
+
+    /**
+     * Get Code Review Audit Results
+     */
+    private static Audit getCodeReviewAudit(JSONArray jsonArray, JSONArray global) {
+
+        LOGGER.info("NFRR Audit Collector auditing CODE_REVIEW");
+        Audit audit = new Audit();
+        audit.setType(AuditType.CODE_REVIEW);
+
+        Audit basicAudit;
+        if ((basicAudit = doBasicAuditCheck(jsonArray, global, AuditType.CODE_REVIEW)) != null) {
+            return basicAudit;
+        }
+        audit.setAuditStatus(AuditStatus.OK);
+        audit.setDataStatus(DataStatus.OK);
+        for (Object o : jsonArray) {
+            JSONObject jo = (JSONObject) o;
+            audit.getUrl().add((String) jo.get(STR_URL));
+            JSONArray directCommits = (JSONArray) jo.get(STR_DIRECTCOMMITS);
+            if (!CollectionUtils.isEmpty(directCommits)) {
+                audit.setAuditStatus(AuditStatus.FAIL);
+                audit.setDataStatus(DataStatus.OK);
+                return audit;
+            }
+            JSONArray pulls = (JSONArray) ((JSONObject) o).get(STR_PULLREQUESTS);
+            for (Object po : pulls) {
+                JSONArray auditJO = (JSONArray) ((JSONObject) po).get(STR_AUDITSTATUSES);
+                boolean reviewed = false;
+                auditJO.stream().map(aj -> audit.getAuditStatusCodes().add((String) aj));
+
+                for (Object s : auditJO) {
+                    String status = (String) s;
+                    if (CodeReviewAuditStatus.PEER_REVIEW_GHR.name().equalsIgnoreCase(status) ||
+                            (CodeReviewAuditStatus.PEER_REVIEW_LGTM_SUCCESS.name().equalsIgnoreCase(status))) {
+                        reviewed = true;
+                        break;
+                    }
+                }
+                if (!reviewed) {
+                    audit.setAuditStatus(AuditStatus.FAIL);
+                    audit.setDataStatus(DataStatus.OK);
+                    return audit;
+                }
+            }
+        }
+        return audit;
+    }
+
+    /**
+     * Do basic audit check - configuration, collector error, no data
+     */
+    private static Audit doBasicAuditCheck(JSONArray jsonArray, JSONArray global, AuditType auditType) {
+        Audit audit = new Audit();
+        audit.setType(auditType);
+        if (!isConfigured(auditType, global)) {
+            audit.setDataStatus(DataStatus.NOT_CONFIGURED);
+            audit.setAuditStatus(AuditStatus.NA);
+            return audit;
+        }
+        if (jsonArray == null || CollectionUtils.isEmpty(jsonArray)) {
+            audit.setAuditStatus(AuditStatus.NA);
+            audit.setDataStatus(DataStatus.NO_DATA);
+            return audit;
+        }
+        if (isCollectorError(jsonArray)) {
+            audit.setAuditStatus(AuditStatus.NA);
+            audit.setDataStatus(DataStatus.ERROR);
+            return audit;
+        }
+        return null;
+    }
+
+    /**
+     * Check for collector error
+     */
+    private static boolean isCollectorError(JSONArray jsonArray) {
+        Stream<JSONObject> jsonObjectStream = jsonArray.stream().map((Object object) -> (JSONObject) object);
+        Stream<JSONArray> auditStatusArray = jsonObjectStream.map(jsonObject -> (JSONArray) jsonObject.get(STR_AUDITSTATUSES));
+        return auditStatusArray.anyMatch(aSArray -> aSArray.toJSONString().contains(DashboardAuditStatus.COLLECTOR_ITEM_ERROR.name()));
+    }
+
+    /**
+     * Check for dashboard audit type configuration
+     */
+    @SuppressWarnings("PMD.NPathComplexity")
+    private static boolean isConfigured(AuditType auditType, JSONArray jsonArray) {
+        if (auditType.equals(AuditType.CODE_REVIEW)) {
+            return (jsonArray.toJSONString().contains(DashboardAuditStatus.DASHBOARD_REPO_CONFIGURED.name()) ? true : false);
+        }
+        if (auditType.equals(AuditType.CODE_QUALITY)) {
+            return (jsonArray.toJSONString().contains(DashboardAuditStatus.DASHBOARD_CODEQUALITY_CONFIGURED.name()) ? true : false);
+        }
+        if (auditType.equals(AuditType.STATIC_SECURITY_ANALYSIS)) {
+            return (jsonArray.toJSONString().contains(DashboardAuditStatus.DASHBOARD_STATIC_SECURITY_ANALYSIS_CONFIGURED.name()) ? true : false);
+        }
+        if (auditType.equals(AuditType.LIBRARY_POLICY)) {
+            return (jsonArray.toJSONString().contains(DashboardAuditStatus.DASHBOARD_LIBRARY_POLICY_ANALYSIS_CONFIGURED.name()) ? true : false);
+        }
+        if (auditType.equals(AuditType.TEST_RESULT)) {
+            return (jsonArray.toJSONString().contains(DashboardAuditStatus.DASHBOARD_TEST_CONFIGURED.name()) ? true : false);
+        }
+        if (auditType.equals(AuditType.PERF_TEST)) {
+            return (jsonArray.toJSONString().contains(DashboardAuditStatus.DASHBOARD_PERFORMANCE_TEST_CONFIGURED.name()) ? true : false);
+        }
+        if (auditType.equals(AuditType.BUILD_REVIEW)) {
+            return (jsonArray.toJSONString().contains(DashboardAuditStatus.DASHBOARD_BUILD_CONFIGURED.name()) ? true : false);
+        }
+        return false;
+    }
+
+
+    /**
+     * Get code quality audit results
+     */
+    private static Audit getCodeQualityAudit(JSONArray jsonArray, JSONArray global) {
+
+        LOGGER.info("NFRR Audit Collector auditing CODE_QUALITY");
+        Audit audit = new Audit();
+        audit.setType(AuditType.CODE_QUALITY);
+        Audit basicAudit;
+        if ((basicAudit = doBasicAuditCheck(jsonArray, global, AuditType.CODE_QUALITY)) != null) {
+            return basicAudit;
+        }
+        audit.setAuditStatus(AuditStatus.OK);
+        audit.setDataStatus(DataStatus.OK);
+        for (Object o : jsonArray) {
+            audit.getUrl().add((String) ((JSONObject) o).get(STR_URL));
+            JSONArray auditJO = (JSONArray) ((JSONObject) o).get(STR_AUDITSTATUSES);
+            auditJO.stream().map(aj -> audit.getAuditStatusCodes().add((String) aj));
+            boolean ok = false;
+            for (Object s : auditJO) {
+                String status = (String) s;
+                audit.getAuditStatusCodes().add(status);
+                if (CodeQualityAuditStatus.CODE_QUALITY_AUDIT_OK.name().equalsIgnoreCase(status)) {
+                    ok = true;
+                    break;
+                }
+                if (CodeQualityAuditStatus.CODE_QUALITY_DETAIL_MISSING.name().equalsIgnoreCase(status)) {
+                    audit.setAuditStatus(AuditStatus.NA);
+                    audit.setDataStatus(DataStatus.NO_DATA);
+                    return audit;
+                }
+            }
+            if (!ok) {
+                audit.setAuditStatus(AuditStatus.FAIL);
+                return audit;
+            }
+        }
+        return audit;
+    }
+
+
+    /**
+     * Get security audit results
+     */
+    private static Audit getSecurityAudit(JSONArray jsonArray, JSONArray global) {
+
+        LOGGER.info("NFRR Audit Collector auditing STATIC_SECURITY_ANALYSIS");
+        Audit audit = new Audit();
+        audit.setType(AuditType.STATIC_SECURITY_ANALYSIS);
+        Audit basicAudit;
+        if ((basicAudit = doBasicAuditCheck(jsonArray, global, AuditType.STATIC_SECURITY_ANALYSIS)) != null) {
+            return basicAudit;
+        }
+        audit.setAuditStatus(AuditStatus.OK);
+        audit.setDataStatus(DataStatus.OK);
+        for (Object o : jsonArray) {
+            JSONArray auditJO = (JSONArray) ((JSONObject) o).get(STR_AUDITSTATUSES);
+            audit.getUrl().add((String) ((JSONObject) o).get(STR_URL));
+            auditJO.stream().map(aj -> audit.getAuditStatusCodes().add((String) aj));
+            boolean ok = false;
+            for (Object s : auditJO) {
+                String status = (String) s;
+
+                if (CodeQualityAuditStatus.STATIC_SECURITY_SCAN_OK.name().equalsIgnoreCase(status)) {
+                    ok = true;
+                    break;
+                }
+                if (CodeQualityAuditStatus.STATIC_SECURITY_SCAN_MISSING.name().equalsIgnoreCase(status)) {
+                    audit.setAuditStatus(AuditStatus.NA);
+                    audit.setDataStatus(DataStatus.NO_DATA);
+                    return audit;
+                }
+            }
+            if (!ok) {
+                audit.setAuditStatus(AuditStatus.FAIL);
+                return audit;
+            }
+        }
+        return audit;
+    }
+
+
+    /**
+     * Get library policy  audit results
+     */
+    private static Audit getOSSAudit(JSONArray jsonArray, JSONArray global) {
+
+        LOGGER.info("NFRR Audit Collector auditing LIBRARY_POLICY");
+        Audit audit = new Audit();
+        audit.setType(AuditType.LIBRARY_POLICY);
+
+        Audit basicAudit;
+        if ((basicAudit = doBasicAuditCheck(jsonArray, global, AuditType.LIBRARY_POLICY)) != null) {
+            return basicAudit;
+        }
+        audit.setAuditStatus(AuditStatus.OK);
+        audit.setDataStatus(DataStatus.OK);
+        for (Object o : jsonArray) {
+            JSONArray auditJO = (JSONArray) ((JSONObject) o).get(STR_AUDITSTATUSES);
+            audit.getUrl().add((String) ((JSONObject) o).get(STR_URL));
+            auditJO.stream().map(aj -> audit.getAuditStatusCodes().add((String) aj));
+            boolean ok = false;
+            for (Object s : auditJO) {
+                String status = (String) s;
+                if (LibraryPolicyAuditStatus.LIBRARY_POLICY_AUDIT_OK.name().equalsIgnoreCase(status)) {
+                    ok = true;
+                    break;
+                }
+                if (LibraryPolicyAuditStatus.LIBRARY_POLICY_AUDIT_MISSING.name().equalsIgnoreCase(status)) {
+                    audit.setAuditStatus(AuditStatus.NA);
+                    audit.setDataStatus(DataStatus.NO_DATA);
+                    return audit;
+                }
+            }
+            if (!ok) {
+                audit.setAuditStatus(AuditStatus.FAIL);
+                return audit;
+            }
+        }
+        return audit;
+    }
+
+
+    /**
+     * Get test result audit results
+     */
+    private static Audit getTestAudit(JSONArray jsonArray, JSONArray global) {
+
+        LOGGER.info("NFRR Audit Collector auditing TEST_RESULT");
+        Audit audit = new Audit();
+        audit.setType(AuditType.TEST_RESULT);
+
+        Audit basicAudit;
+        if ((basicAudit = doBasicAuditCheck(jsonArray, global, AuditType.TEST_RESULT)) != null) {
+            return basicAudit;
+        }
+        audit.setAuditStatus(AuditStatus.OK);
+        audit.setDataStatus(DataStatus.OK);
+        for (Object o : jsonArray) {
+            JSONArray auditJO = (JSONArray) ((JSONObject) o).get(STR_AUDITSTATUSES);
+            audit.getUrl().add((String) ((JSONObject) o).get(STR_URL));
+            auditJO.stream().map(aj -> audit.getAuditStatusCodes().add((String) aj));
+            boolean ok = false;
+            for (Object s : auditJO) {
+                String status = (String) s;
+                if (TestResultAuditStatus.TEST_RESULT_AUDIT_OK.name().equalsIgnoreCase(status)) {
+                    ok = true;
+                    break;
+                }
+                if (TestResultAuditStatus.TEST_RESULT_MISSING.name().equalsIgnoreCase(status)) {
+                    audit.setAuditStatus(AuditStatus.NA);
+                    audit.setDataStatus(DataStatus.NO_DATA);
+                    return audit;
+                }
+            }
+            if (!ok) {
+                audit.setAuditStatus(AuditStatus.FAIL);
+                return audit;
+            }
+        }
+        return audit;
+    }
+
+
+    /**
+     * Get performance testing audit results
+     */
+    private static Audit getPerfAudit(JSONArray jsonArray, JSONArray global) {
+
+        LOGGER.info("NFRR Audit Collector auditing PERF_TEST");
+        Audit audit = new Audit();
+        audit.setType(AuditType.PERF_TEST);
+
+        Audit basicAudit;
+        if ((basicAudit = doBasicAuditCheck(jsonArray, global, AuditType.PERF_TEST)) != null) {
+            return basicAudit;
+        }
+        audit.setAuditStatus(AuditStatus.OK);
+        audit.setDataStatus(DataStatus.OK);
+        for (Object o : jsonArray) {
+            JSONArray auditJO = (JSONArray) ((JSONObject) o).get(STR_AUDITSTATUSES);
+            audit.getUrl().add((String) ((JSONObject) o).get(STR_URL));
+            auditJO.stream().map(aj -> audit.getAuditStatusCodes().add((String) aj));
+            boolean ok = false;
+            for (Object s : auditJO) {
+                String status = (String) s;
+                if (PerformanceTestAuditStatus.PERF_RESULT_AUDIT_OK.name().equalsIgnoreCase(status)) {
+                    ok = true;
+                    break;
+                }
+                if (PerformanceTestAuditStatus.PERF_RESULT_AUDIT_MISSING.name().equalsIgnoreCase(status)) {
+                    audit.setAuditStatus(AuditStatus.NA);
+                    audit.setDataStatus(DataStatus.NO_DATA);
+                    return audit;
+                }
+            }
+            if (!ok) {
+                audit.setAuditStatus(AuditStatus.FAIL);
+                return audit;
+            }
+        }
+        return audit;
+    }
+
+    /**
+     * Get all audit results
+     */
+    @SuppressWarnings("PMD")
+    public static Map<AuditType, Audit> getAudit(Dashboard dashboard, AuditSettings settings, long begin, long end) {
+        Map<AuditType, Audit> audits = new HashMap<>();
+
+        String url = getAuditAPIUrl(dashboard, settings, begin, end);
+        JSONObject auditResponseObj = parseObject(url, settings);
+        if(auditResponseObj == null){
+            return audits;
+        }
+        JSONArray globalStatus = (JSONArray) auditResponseObj.get(STR_AUDITSTATUSES);
+        JSONObject review = (JSONObject) auditResponseObj.get(STR_REVIEW);
+
+        JSONArray codeReviewJO = review.get(AuditType.CODE_REVIEW.name()) == null ? null : (JSONArray) review.get(AuditType.CODE_REVIEW.name());
+        Audit audit = getCodeReviewAudit(codeReviewJO, globalStatus);
+        audits.put(audit.getType(), audit);
+
+        JSONArray scaJO = review.get(AuditType.CODE_QUALITY.name()) == null ? null : (JSONArray) review.get(AuditType.CODE_QUALITY.name());
+        audit = getCodeQualityAudit(scaJO, globalStatus);
+        audits.put(audit.getType(), audit);
+
+        JSONArray perfJO = review.get(AuditType.PERF_TEST.name()) == null ? null : (JSONArray) review.get(AuditType.PERF_TEST.name());
+        audit = getPerfAudit(perfJO, globalStatus);
+        audits.put(audit.getType(), audit);
+
+        JSONArray ossJO = review.get(AuditType.LIBRARY_POLICY.name()) == null ? null : (JSONArray) review.get(AuditType.LIBRARY_POLICY.name());
+        audit = getOSSAudit(ossJO, globalStatus);
+        audits.put(audit.getType(), audit);
+
+        JSONArray testJO = review.get(AuditType.TEST_RESULT.name()) == null ? null : (JSONArray) review.get(AuditType.TEST_RESULT.name());
+        audit = getTestAudit(testJO, globalStatus);
+        audits.put(audit.getType(), audit);
+
+        JSONArray sscaJO = review.get(AuditType.STATIC_SECURITY_ANALYSIS.name()) == null ? null : (JSONArray) review.get(AuditType.STATIC_SECURITY_ANALYSIS.name());
+        audit = getSecurityAudit(sscaJO, globalStatus);
+        audits.put(audit.getType(), audit);
+        return audits;
+    }
+
+    /**
+     * Make audit api rest call and parse response
+     */
+    protected static JSONObject parseObject(String url, AuditSettings settings){
+        LOGGER.info("NFRR Audit Collector Audit API Call");
+        RestTemplate restTemplate = new RestTemplate();
+        JSONObject responseObj = null;
+        try {
+            ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.GET, getHeaders(settings), String.class);
+            JSONParser jsonParser = new JSONParser();
+            responseObj = (JSONObject) jsonParser.parse(response.getBody());
+        } catch (Exception e) {
+            LOGGER.error("Error while calling audit api for the params : " + url.substring(url.lastIndexOf("?")),e);
+        }
+        return responseObj;
+    }
+
+    /**
+     * Construct audit api url
+     */
+    protected static String getAuditAPIUrl(Dashboard dashboard, AuditSettings settings, long beginDate, long endDate) {
+        LOGGER.info("NFRR Audit Collector creates Audit API URL");
+        if (CollectionUtils.isEmpty(settings.getServers())) {
+            LOGGER.error("No Server Found to run NoFearRelease audit collector");
+            throw new MBeanServerNotFoundException("No Server Found to run NoFearRelease audit collector");
+        }
+        URIBuilder auditURI = new URIBuilder();
+        auditURI.setPath(settings.getServers().get(0) + HYGIEIA_AUDIT_URL);
+        auditURI.addParameter(AUDIT_PARAMS.title.name(), dashboard.getTitle());
+        auditURI.addParameter(AUDIT_PARAMS.businessService.name(), dashboard.getConfigurationItemBusServName());
+        auditURI.addParameter(AUDIT_PARAMS.businessApplication.name(), dashboard.getConfigurationItemBusAppName());
+        auditURI.addParameter(AUDIT_PARAMS.beginDate.name(), String.valueOf(beginDate));
+        auditURI.addParameter(AUDIT_PARAMS.endDate.name(), String.valueOf(endDate));
+        auditURI.addParameter(AUDIT_PARAMS.auditType.name(),"");
+        String auditURIStr = auditURI.toString().replace("+", " ");
+        return auditURIStr + AUDITTYPES_PARAM;
+    }
+
+    /**
+     * Get api authentication headers
+     */
+    protected static HttpEntity getHeaders(AuditSettings auditSettings) {
+        HttpHeaders headers = new HttpHeaders();
+        if (!CollectionUtils.isEmpty(auditSettings.getUsernames()) && !CollectionUtils.isEmpty(auditSettings.getApiKeys())) {
+            headers.set(STR_APIUSER, auditSettings.getUsernames().iterator().next());
+            headers.set(STR_AUTHORIZATION, STR_APITOKENSPACE + auditSettings.getApiKeys().iterator().next());
+        }
+        return new HttpEntity<>(headers);
+    }
+
+    /**
+     * Add audit result by audit type
+     */
+    @SuppressWarnings("PMD.NPathComplexity")
+    public static void addAuditResultByAuditType(Dashboard dashboard, Map<AuditType, Audit> auditMap, CmdbRepository cmdbRepository, long timestamp) {
+
+        if(CollectionUtils.isEmpty(auditMap)){ return; }
+        Cmdb cmdb = cmdbRepository.findByConfigurationItem(dashboard.getConfigurationItemBusServName());
+        ObjectId dashboardId = dashboard.getId();
+        String dashboardTitle = dashboard.getTitle();
+        String ownerDept = ((cmdb == null || cmdb.getOwnerDept() == null) ? "" : cmdb.getOwnerDept());
+        String appService = (dashboard.getConfigurationItemBusServName() == null ? "" : dashboard.getConfigurationItemBusServName());
+        String appBusApp = (dashboard.getConfigurationItemBusAppName() == null ? "" : dashboard.getConfigurationItemBusAppName());
+        String appServiceOwner = ((cmdb == null || cmdb.getAppServiceOwner() == null) ? "" : cmdb.getAppServiceOwner());
+        String appBusAppOwner = ((cmdb == null || cmdb.getBusinessOwner() == null) ? "" : cmdb.getBusinessOwner());
+
+        Arrays.stream(AuditType.values()).forEach((AuditType auditType) -> {
+            if (!(auditType.equals(AuditType.ALL) || auditType.equals(AuditType.BUILD_REVIEW))) {
+                Audit audit = auditMap.get(auditType);
+                AuditResult auditResult = new AuditResult(dashboardId, dashboardTitle, ownerDept, appService, appBusApp, appServiceOwner, appBusAppOwner,
+                        auditType, audit.getDataStatus().name(), audit.getAuditStatus().name(), String.join(",", audit.getAuditStatusCodes()),
+                        String.join(",", audit.getUrl()), timestamp);
+                auditResults.add(auditResult);
+            }
+        });
+    }
+
+    /**
+     * Get audit results collection
+     */
+    protected static List<AuditResult> getAuditResults() {
+        return auditResults;
+    }
+
+    /**
+     * Clear audit results repository
+     */
+    public static void clearAuditResultRepo(AuditResultRepository auditResultRepository) {
+        LOGGER.info("NFRR Audit Collector clears last collected audit results from database");
+        auditResultRepository.deleteAll();
+    }
+
+    /**
+     * Clear audit results collection
+     */
+    public static void clearAuditResults() {
+        auditResults.clear();
+    }
+}
diff --git a/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/collector/AuditSettings.java b/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/collector/AuditSettings.java
new file mode 100644
index 0000000000..73e4ab6efe
--- /dev/null
+++ b/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/collector/AuditSettings.java
@@ -0,0 +1,97 @@
+package com.capitalone.dashboard.collector;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+import java.util.List;
+
+/**
+ * Bean to hold settings specific to the Audit Collector.
+ */
+@Component
+@ConfigurationProperties(prefix = "nfrr")
+public class AuditSettings {
+
+    private String cron;
+    private boolean saveLog;
+    private List<String> servers;
+    private List<String> environments;
+    private List<String> usernames;
+    private List<String> apiKeys;
+    private String dockerLocalHostIP; //null if not running in docker on http://localhost
+    private int days;
+
+    public int getDays() {
+        return days;
+    }
+
+    public void setDays(int days) {
+        this.days = days;
+    }
+
+    public String getCron() {
+        return cron;
+    }
+
+    public void setCron(String cron) {
+        this.cron = cron;
+    }
+
+    public boolean isSaveLog() {
+        return saveLog;
+    }
+
+    public void setSaveLog(boolean saveLog) {
+        this.saveLog = saveLog;
+    }
+
+    public List<String> getServers() {
+        return servers;
+    }
+
+    public void setServers(List<String> servers) {
+        this.servers = servers;
+    }
+
+    public List<String> getUsernames() {
+        return usernames;
+    }
+
+    public void setUsernames(List<String> usernames) {
+        this.usernames = usernames;
+    }
+
+    public List<String> getApiKeys() {
+        return apiKeys;
+    }
+
+    public void setApiKeys(List<String> apiKeys) {
+        this.apiKeys = apiKeys;
+    }
+
+    public List<String> getEnvironments() {
+        return environments;
+    }
+
+    public void setEnvironments(List<String> environments) {
+        this.environments = environments;
+    }
+
+    //Docker NATs the real host localhost to 10.0.2.2 when running in docker
+    //as localhost is stored in the JSON payload from jenkins we need
+    //this hack to fix the addresses
+    public String getDockerLocalHostIP() {
+
+        //we have to do this as spring will return NULL if the value is not set vs and empty string
+        String localHostOverride = "";
+        if (dockerLocalHostIP != null) {
+            localHostOverride = dockerLocalHostIP;
+        }
+        return localHostOverride;
+    }
+
+    public void setDockerLocalHostIP(String dockerLocalHostIP) {
+        this.dockerLocalHostIP = dockerLocalHostIP;
+    }
+}
+
+
diff --git a/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/model/Audit.java b/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/model/Audit.java
new file mode 100644
index 0000000000..b0e7fc9142
--- /dev/null
+++ b/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/model/Audit.java
@@ -0,0 +1,52 @@
+package com.capitalone.dashboard.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Audit {
+    private AuditType type;
+    private AuditStatus auditStatus;
+    private DataStatus dataStatus;
+    private List<String> url = new ArrayList<>();
+    private List<String> auditStatusCodes = new ArrayList<>();
+
+    public AuditType getType() {
+        return type;
+    }
+
+    public void setType(AuditType type) {
+        this.type = type;
+    }
+
+    public AuditStatus getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(AuditStatus auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public DataStatus getDataStatus() {
+        return dataStatus;
+    }
+
+    public void setDataStatus(DataStatus dataStatus) {
+        this.dataStatus = dataStatus;
+    }
+
+    public List<String> getUrl() {
+        return url;
+    }
+
+    public void setUrl(List<String> url) {
+        this.url = url;
+    }
+
+    public List<String> getAuditStatusCodes() {
+        return auditStatusCodes;
+    }
+
+    public void setAuditStatusCodes(List<String> auditStatusCodes) {
+        this.auditStatusCodes = auditStatusCodes;
+    }
+}
\ No newline at end of file
diff --git a/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/model/AuditStatus.java b/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/model/AuditStatus.java
new file mode 100644
index 0000000000..d1a0633df4
--- /dev/null
+++ b/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/model/AuditStatus.java
@@ -0,0 +1,16 @@
+package com.capitalone.dashboard.model;
+
+public enum AuditStatus {
+    NA,
+    OK,
+    FAIL;
+
+    public static AuditStatus fromString(String value) {
+        for (AuditStatus auditType : values()) {
+            if (auditType.toString().equalsIgnoreCase(value)) {
+                return auditType;
+            }
+        }
+        throw new IllegalArgumentException(value + " is not a Audit Type");
+    }
+}
diff --git a/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/model/DataStatus.java b/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/model/DataStatus.java
new file mode 100644
index 0000000000..dbd20cf3d5
--- /dev/null
+++ b/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/model/DataStatus.java
@@ -0,0 +1,18 @@
+package com.capitalone.dashboard.model;
+
+public enum DataStatus {
+    ERROR,
+    NA,
+    OK,
+    NOT_CONFIGURED,
+    NO_DATA;
+    
+    public static DataStatus fromString(String value) {
+        for (DataStatus auditType : values()) {
+            if (auditType.toString().equalsIgnoreCase(value)) {
+                return auditType;
+            }
+        }
+        throw new IllegalArgumentException(value + " is not a Data Status Type");
+    }
+}
diff --git a/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/repository/AuditCollectorRepository.java b/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/repository/AuditCollectorRepository.java
new file mode 100644
index 0000000000..a9c62b7505
--- /dev/null
+++ b/collectors/audit/nfrr/src/main/java/com/capitalone/dashboard/repository/AuditCollectorRepository.java
@@ -0,0 +1,6 @@
+package com.capitalone.dashboard.repository;
+
+import com.capitalone.dashboard.collector.AuditCollector;
+
+public interface AuditCollectorRepository extends BaseCollectorRepository<AuditCollector> {
+}
diff --git a/collectors/audit/nfrr/src/main/resources/logback.xml b/collectors/audit/nfrr/src/main/resources/logback.xml
new file mode 100644
index 0000000000..f3c188b7e2
--- /dev/null
+++ b/collectors/audit/nfrr/src/main/resources/logback.xml
@@ -0,0 +1,29 @@
+<configuration>
+<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+ <appender name="ROLLING" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <!-- rollover daily -->
+      <fileNamePattern>logs/nfrrauditcollector-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+      <timeBasedFileNamingAndTriggeringPolicy
+            class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+        <!-- or whenever the file size reaches 100MB -->
+        <maxFileSize>20MB</maxFileSize>
+      </timeBasedFileNamingAndTriggeringPolicy>
+      <maxHistory>30</maxHistory>
+    </rollingPolicy>
+    <encoder>
+       <pattern>%d %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+ </appender>
+
+  <root level="INFO">
+      <appender-ref ref="ROLLING" />
+      <appender-ref ref="STDOUT" />
+  </root>
+</configuration>
diff --git a/collectors/audit/nfrr/src/test/java/com/capitalone/dashboard/collector/AuditCollectorTaskTest.java b/collectors/audit/nfrr/src/test/java/com/capitalone/dashboard/collector/AuditCollectorTaskTest.java
new file mode 100644
index 0000000000..70c398b5ca
--- /dev/null
+++ b/collectors/audit/nfrr/src/test/java/com/capitalone/dashboard/collector/AuditCollectorTaskTest.java
@@ -0,0 +1,110 @@
+package com.capitalone.dashboard.collector;
+
+import com.capitalone.dashboard.collector.config.FongoConfig;
+import com.capitalone.dashboard.collector.config.TestConfig;
+import com.capitalone.dashboard.model.Dashboard;
+import com.capitalone.dashboard.model.AuditResult;
+import com.capitalone.dashboard.model.AuditType;
+import com.capitalone.dashboard.model.Audit;
+import com.capitalone.dashboard.model.AuditStatus;
+import com.capitalone.dashboard.model.DataStatus;
+import com.capitalone.dashboard.repository.AuditResultRepository;
+import com.capitalone.dashboard.repository.DashboardRepository;
+import com.capitalone.dashboard.repository.ComponentRepository;
+import com.capitalone.dashboard.repository.CollectorRepository;
+import com.capitalone.dashboard.repository.CollectorItemRepository;
+import org.bson.types.ObjectId;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Set;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.HashSet;
+
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertTrue;
+
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = {FongoConfig.class})
+public class AuditCollectorTaskTest {
+    @Autowired
+    private AuditResultRepository mockstatusRepository;
+    @Autowired
+    private DashboardRepository dashboardRepository;
+    @Autowired
+    private ComponentRepository componentRepository;
+    @Autowired
+    private CollectorRepository collectorRepository;
+    @Autowired
+    private CollectorItemRepository collectorItemRepository;
+
+    AuditSettings settings = new AuditSettings();
+    private static final long BEGIN_DATE = 1537824736000L;
+    private static final long END_DATE = 1540503701000L;
+
+    @Before
+    public void setup() throws IOException {
+        TestUtils.loadDashBoard(dashboardRepository);
+        TestUtils.loadCollector(collectorRepository);
+        TestUtils.loadComponent(componentRepository);
+        TestUtils.loadCollectorItems(collectorItemRepository);
+        settings = new TestConfig().settings();
+    }
+    @Test
+    public void getCollectAuditStatusData(){
+        Iterable<Dashboard> recentDashboards = dashboardRepository.findAll();
+        List<AuditResult> auditResults = new ArrayList<>();
+        AuditResult auditResult1 = new AuditResult(ObjectId.get(),"auditTestDashboard" , "CARD",
+                "ASVC","BAP" ,"Owner" ,null ,
+                AuditType.CODE_QUALITY ,"OK","OK" ,null,null ,7883L );
+        auditResults.add(auditResult1);
+
+        Set<AuditType> allAuditTypes = new HashSet<>();
+        allAuditTypes.add(AuditType.CODE_QUALITY);
+        recentDashboards.forEach(dashboard -> {
+            try {
+                Map<AuditType, Audit> auditMap = AuditCollectorUtil.getAudit(dashboard, settings, BEGIN_DATE, END_DATE);
+                Map<AuditType,Audit> auditMap1 = new HashMap<>();
+                Audit auditCQ = new Audit();
+                auditCQ.setType(AuditType.CODE_QUALITY);
+                auditCQ.setAuditStatus(AuditStatus.OK);
+                auditCQ.setDataStatus(DataStatus.OK);
+                auditMap1.put(AuditType.CODE_QUALITY, auditCQ);
+                AuditResult auditResult = AuditCollectorUtil.getAuditResults().get(0);
+                Mockito.when(AuditCollectorUtil.getAudit(dashboard,settings,BEGIN_DATE,END_DATE)).thenReturn(auditMap1);
+                assertNotNull(auditResult.getDashboardId());
+                assertNotNull(auditResult.getDashboardTitle());
+                assertNotNull(auditResult.getTimestamp());
+                assertTrue(auditResult.getDashboardId().equals(dashboard.getId()));
+                assertTrue(auditResult.getDashboardTitle().equalsIgnoreCase(dashboard.getTitle()));
+                assertTrue(auditResult.getTimestamp() == END_DATE);
+                auditResults.add(auditResult);
+                assertNotNull(auditResults);
+            } catch (Exception e) {
+                e.getLocalizedMessage();
+            }
+            if (!auditResults.isEmpty()) {
+                mockstatusRepository.save(auditResults);
+                assertNotNull(mockstatusRepository);
+                Iterable<AuditResult> auditresult2 = mockstatusRepository.findByDashboardTitle("auditTestDashboard");
+                auditresult2.forEach(auditResult -> {
+                    assertTrue(auditResult.getDashboardTitle().equals("auditTestDashboard"));
+                    assertTrue(auditResult.getLineOfBusiness().equals("CARD"));;
+                    assertTrue(auditResult.getAuditType().equals(AuditType.CODE_QUALITY));
+                    assertTrue(auditResult.getAuditTypeStatus().equals(DataStatus.OK.name()));
+                    assertTrue(auditResult.getAuditStatus().equals(AuditStatus.OK.name()));
+                });
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/collectors/audit/nfrr/src/test/java/com/capitalone/dashboard/collector/AuditCollectorTest.java b/collectors/audit/nfrr/src/test/java/com/capitalone/dashboard/collector/AuditCollectorTest.java
new file mode 100644
index 0000000000..adfe3cda16
--- /dev/null
+++ b/collectors/audit/nfrr/src/test/java/com/capitalone/dashboard/collector/AuditCollectorTest.java
@@ -0,0 +1,57 @@
+package com.capitalone.dashboard.collector;
+
+import com.capitalone.dashboard.collector.config.TestConfig;
+import com.capitalone.dashboard.model.CollectorType;
+import com.capitalone.dashboard.repository.AuditCollectorRepository;
+import com.capitalone.dashboard.repository.AuditResultRepository;
+import com.capitalone.dashboard.repository.DashboardRepository;
+import org.assertj.core.api.AssertionsForInterfaceTypes;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.scheduling.TaskScheduler;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.mockito.Mockito.mock;
+
+public class AuditCollectorTest {
+
+    private AuditCollectorTask taskToTest;
+    private TaskScheduler taskScheduler;
+    private DashboardRepository dashboardRepository;
+    private AuditResultRepository auditResultRepository;
+    private AuditCollectorRepository auditCollectorRepository;
+    private AuditSettings auditSettings;
+
+    @Before
+    public void setup() {
+        taskScheduler = mock(TaskScheduler.class);
+        auditResultRepository = mock(AuditResultRepository.class);
+        auditCollectorRepository = mock(AuditCollectorRepository.class);
+        dashboardRepository = mock(DashboardRepository.class);
+        auditSettings = new TestConfig().settings();
+        this.taskToTest = new AuditCollectorTask(taskScheduler, dashboardRepository, auditResultRepository,
+                auditCollectorRepository, auditSettings);
+    }
+
+    @Test
+    public void getCollectorReturnsAuditStatusCollector() {
+        final AuditCollector collector = taskToTest.getCollector();
+        assertThat(collector).isNotNull().isInstanceOf(AuditCollector.class);
+        assertThat(collector.isEnabled()).isTrue();
+        assertThat(collector.isOnline()).isTrue();
+        AssertionsForInterfaceTypes.assertThat(collector.getAuditServers()).contains(auditSettings.getServers().get(0));
+        AssertionsForInterfaceTypes.assertThat(collector.getCollectorType()).isEqualTo(CollectorType.Audit);
+        assertThat(collector.getName()).isEqualTo("AuditCollector");
+        assertThat(collector.getCollectorType()).isEqualTo(CollectorType.Audit);
+    }
+
+    @Test
+    public void getCollectorRepositoryReturnsTheRepository() {
+        assertThat(taskToTest.getCollectorRepository()).isNotNull().isInstanceOf(AuditCollectorRepository.class);
+    }
+
+    @Test
+    public void getCron() {
+        assertThat(taskToTest.getCron().equals(auditSettings.getCron()));
+    }
+}
diff --git a/collectors/audit/nfrr/src/test/java/com/capitalone/dashboard/collector/TestUtils.java b/collectors/audit/nfrr/src/test/java/com/capitalone/dashboard/collector/TestUtils.java
new file mode 100644
index 0000000000..2e8a8389bd
--- /dev/null
+++ b/collectors/audit/nfrr/src/test/java/com/capitalone/dashboard/collector/TestUtils.java
@@ -0,0 +1,53 @@
+package com.capitalone.dashboard.collector;
+
+import com.capitalone.dashboard.model.Collector;
+import com.capitalone.dashboard.model.CollectorItem;
+import com.capitalone.dashboard.model.Component;
+import com.capitalone.dashboard.model.Dashboard;
+import com.capitalone.dashboard.repository.CollectorItemRepository;
+import com.capitalone.dashboard.repository.CollectorRepository;
+import com.capitalone.dashboard.repository.ComponentRepository;
+import com.capitalone.dashboard.repository.DashboardRepository;
+import com.capitalone.dashboard.testutil.GsonUtil;
+import com.google.common.io.Resources;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import org.apache.commons.io.IOUtils;
+
+import java.io.IOException;
+import java.util.List;
+
+public class TestUtils {
+
+    public static void loadDashBoard(DashboardRepository dashboardRepository) throws IOException {
+        Gson gson = GsonUtil.getGson();
+        String json = IOUtils.toString(Resources.getResource("./dashboard/dashboard.json"));
+        Dashboard dashboard = gson.fromJson(json, Dashboard.class);
+        dashboardRepository.save(dashboard);
+    }
+
+    public static void loadCollector(CollectorRepository collectorRepository) throws IOException {
+        Gson gson = GsonUtil.getGson();
+        String json = IOUtils.toString(Resources.getResource("./collectors/coll.json"));
+        List<Collector> collector = gson.fromJson(json, new TypeToken<List<Collector>>() {
+        }.getType());
+        collectorRepository.save(collector);
+    }
+
+    public static void loadComponent(ComponentRepository componentRepository) throws IOException {
+        Gson gson = GsonUtil.getGson();
+        String json = IOUtils.toString(Resources.getResource("./component/component.json"));
+        Component component = gson.fromJson(json, Component.class);
+        componentRepository.save(component);
+    }
+
+    public static void loadCollectorItems(CollectorItemRepository collectorItemRepository) throws IOException {
+        Gson gson = GsonUtil.getGson();
+        String json = IOUtils.toString(Resources.getResource("./collector_items/items.json"));
+        List<CollectorItem> collectorItem = gson.fromJson(json, new TypeToken<List<CollectorItem>>() {
+        }.getType());
+        collectorItemRepository.save(collectorItem);
+    }
+
+}
+
diff --git a/collectors/audit/nfrr/src/test/java/com/capitalone/dashboard/collector/config/FongoConfig.java b/collectors/audit/nfrr/src/test/java/com/capitalone/dashboard/collector/config/FongoConfig.java
new file mode 100644
index 0000000000..ed520376bb
--- /dev/null
+++ b/collectors/audit/nfrr/src/test/java/com/capitalone/dashboard/collector/config/FongoConfig.java
@@ -0,0 +1,20 @@
+package com.capitalone.dashboard.collector.config;
+
+import com.capitalone.dashboard.config.MongoConfig;
+import com.github.fakemongo.Fongo;
+import com.mongodb.MongoClient;
+import org.springframework.context.annotation.Bean;
+
+public class FongoConfig extends MongoConfig {
+
+    @Override
+    @Bean
+    public MongoClient mongo()  {
+        return new Fongo(getDatabaseName()).getMongo();
+    }
+    
+    @Override
+    protected String getDatabaseName() {
+        return "test-db";
+    }
+}
diff --git a/collectors/audit/nfrr/src/test/java/com/capitalone/dashboard/collector/config/TestConfig.java b/collectors/audit/nfrr/src/test/java/com/capitalone/dashboard/collector/config/TestConfig.java
new file mode 100644
index 0000000000..ef53bea0f9
--- /dev/null
+++ b/collectors/audit/nfrr/src/test/java/com/capitalone/dashboard/collector/config/TestConfig.java
@@ -0,0 +1,28 @@
+package com.capitalone.dashboard.collector.config;
+import com.capitalone.dashboard.collector.AuditSettings;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.core.annotation.Order;
+import java.util.Arrays;
+
+/**
+ * Spring context configuration for Testing purposes
+ */
+@Order(1)
+@Configuration
+@ComponentScan(basePackages ={"com.capitalone.dashboard.model"},
+        includeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value= AuditSettings.class))
+public class TestConfig {
+
+    @Bean
+    public AuditSettings settings() {
+        // Test Config Settings
+        AuditSettings settings = new AuditSettings();
+        settings.setCron("*/2 * * * *");
+        settings.setServers(Arrays.asList("http://localhost:8081/"));
+        return settings;
+    }
+
+}
diff --git a/collectors/audit/nfrr/src/test/resources/collector_items/items.json b/collectors/audit/nfrr/src/test/resources/collector_items/items.json
new file mode 100644
index 0000000000..d4b8932313
--- /dev/null
+++ b/collectors/audit/nfrr/src/test/resources/collector_items/items.json
@@ -0,0 +1,506 @@
+[
+  {
+    "description": "Registered by Remote Call.",
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": {
+      "timestamp": 1456084265,
+      "machineIdentifier": 8366972,
+      "processIdentifier": 26815,
+      "counter": 14369292
+    },
+    "lastUpdated": 1516222021186,
+    "options": {
+      "branch": "master",
+      "url": "https://mygithub.com/compliance-scenario/0-new-repo"
+    },
+    "id": "5a4e524333ec296b81c3936f"
+  },
+  {
+    "description": "card-customer-service:card-cust-service",
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": {
+      "timestamp": 1456084266,
+      "machineIdentifier": 8366972,
+      "processIdentifier": 26815,
+      "counter": 1436929
+    },
+    "lastUpdated": 1523562528850,
+    "options": {
+      "applicationType": null,
+      "reportUrl": "https://appsec.com/StaticSecurityAnalysis",
+      "applicationID": [
+        "TestBusServ"
+      ],
+      "projectName": "cust-service",
+      "applicationName": "customer-service",
+      "instanceUrl": "https://appsec.com"
+    },
+    "id": "5b4e524333ec296b81c3935f"
+  },
+  {
+    "description": "TestAudit",
+    "enabled": false,
+    "errors": [],
+    "pushed": false,
+    "collectorId": {
+      "timestamp": 1515645558,
+      "machineIdentifier": 4693261,
+      "processIdentifier": 6916,
+      "counter": 3010175
+    },
+    "lastUpdated": 0,
+    "options": {
+      "dashboardId": "5a56eae1479d0d1b042dee87"
+    },
+    "id": {
+      "timestamp": 1515646073,
+      "machineIdentifier": 4693261,
+      "processIdentifier": 6916,
+      "counter": 3010194
+    }
+  },
+  {
+    "description": "Registered by Remote Call.",
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": {
+      "timestamp": 1456084265,
+      "machineIdentifier": 8366972,
+      "processIdentifier": 26815,
+      "counter": 14369292
+    },
+    "lastUpdated": 1516222021186,
+    "options": {
+      "branch": "master",
+      "url": "https://mygithub.com/compliance-scenario/0-new-repo"
+    },
+    "id": "5a4e524333ec296b81c3936f"
+  },
+  {
+    "description": "Registered by Remote Call.",
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": {
+      "timestamp": 1456084265,
+      "machineIdentifier": 8366972,
+      "processIdentifier": 26815,
+      "counter": 14369292
+    },
+    "lastUpdated": 1516222021942,
+    "options": {
+      "branch": "master",
+      "url": "https://mygithub.com/compliance-scenario/1-direct-commit"
+    },
+    "id": {
+      "timestamp": 1515082351,
+      "machineIdentifier": 3402793,
+      "processIdentifier": 27521,
+      "counter": 12817252
+    }
+  },
+  {
+    "description": "Registered by Remote Call.",
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": {
+      "timestamp": 1456084265,
+      "machineIdentifier": 8366972,
+      "processIdentifier": 26815,
+      "counter": 14369292
+    },
+    "lastUpdated": 1516222022525,
+    "options": {
+      "branch": "master",
+      "url": "https://mygithub.com/compliance-scenario/2-unreviewed-merge"
+    },
+    "id": {
+      "timestamp": 1515082392,
+      "machineIdentifier": 3402793,
+      "processIdentifier": 27521,
+      "counter": 12817258
+    }
+  },
+  {
+    "description": "Registered by Remote Call.",
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": {
+      "timestamp": 1456084265,
+      "machineIdentifier": 8366972,
+      "processIdentifier": 26815,
+      "counter": 14369292
+    },
+    "lastUpdated": 1516222023061,
+    "options": {
+      "branch": "master",
+      "url": "https://mygithub.com/compliance-scenario/3-github-comment-merge"
+    },
+    "id": {
+      "timestamp": 1515082428,
+      "machineIdentifier": 3402793,
+      "processIdentifier": 27521,
+      "counter": 12817263
+    }
+  },
+  {
+    "description": "Registered by Remote Call.",
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": {
+      "timestamp": 1456084265,
+      "machineIdentifier": 8366972,
+      "processIdentifier": 26815,
+      "counter": 14369292
+    },
+    "lastUpdated": 1516222023498,
+    "options": {
+      "branch": "master",
+      "url": "https://mygithub.com/compliance-scenario/4-github-review-merge"
+    },
+    "id": {
+      "timestamp": 1515082480,
+      "machineIdentifier": 3402793,
+      "processIdentifier": 27521,
+      "counter": 12817268
+    }
+  },
+  {
+    "description": "Registered by Remote Call.",
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": {
+      "timestamp": 1456084265,
+      "machineIdentifier": 8366972,
+      "processIdentifier": 26815,
+      "counter": 14369292
+    },
+    "lastUpdated": 1516222024012,
+    "options": {
+      "branch": "master",
+      "url": "https://mygithub.com/compliance-scenario/5-lgtm-self-merge"
+    },
+    "id": {
+      "timestamp": 1515082524,
+      "machineIdentifier": 3402793,
+      "processIdentifier": 27521,
+      "counter": 12817274
+    }
+  },
+  {
+    "description": "Registered by Remote Call.",
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": {
+      "timestamp": 1456084265,
+      "machineIdentifier": 8366972,
+      "processIdentifier": 26815,
+      "counter": 14369292
+    },
+    "lastUpdated": 1516222024449,
+    "options": {
+      "branch": "master",
+      "url": "https://mygithub.com/compliance-scenario/6-lgtm-merge"
+    },
+    "id": {
+      "timestamp": 1515082558,
+      "machineIdentifier": 3402793,
+      "processIdentifier": 27521,
+      "counter": 12817279
+    }
+  },
+  {
+    "description": "Registered by Remote Call.",
+    "enabled": true,
+    "errors": [
+      {
+        "errorCode": "-1",
+        "errorMessage": "Error in GraphQL query:[{\"path\":[\"repository\"],\"locations\":[{\"line\":2,\"column\":3}],\"message\":\"Could not resolve to a Repository with the name \u00277-private-repo\u0027.\",\"type\":\"NOT_FOUND\"}]",
+        "timestamp": 1516222002518
+      },
+      {
+        "errorCode": "-1",
+        "errorMessage": "Error in GraphQL query:[{\"path\":[\"repository\"],\"locations\":[{\"line\":2,\"column\":3}],\"message\":\"Could not resolve to a Repository with the name \u00277-private-repo\u0027.\",\"type\":\"NOT_FOUND\"}]",
+        "timestamp": 1516222020507
+      }
+    ],
+    "pushed": false,
+    "collectorId": {
+      "timestamp": 1456084265,
+      "machineIdentifier": 8366972,
+      "processIdentifier": 26815,
+      "counter": 14369292
+    },
+    "lastUpdated": 0,
+    "options": {
+      "branch": "master",
+      "url": "https://mygithub.com/compliance-scenario/7-private-repo"
+    },
+    "id": {
+      "timestamp": 1515082653,
+      "machineIdentifier": 3402793,
+      "processIdentifier": 27521,
+      "counter": 12817284
+    }
+  },
+  {
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": {
+      "timestamp": 1456084265,
+      "machineIdentifier": 8366972,
+      "processIdentifier": 26815,
+      "counter": 14369292
+    },
+    "lastUpdated": 1516222024902,
+    "options": {
+      "password": "",
+      "scm": "Github",
+      "branch": "master",
+      "userID": "",
+      "url": "https://mygithub.com/Devopscode/NormalMerge"
+    },
+    "id": {
+      "timestamp": 1515082910,
+      "machineIdentifier": 3402793,
+      "processIdentifier": 27521,
+      "counter": 12817291
+    }
+  },
+  {
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": {
+      "timestamp": 1456084265,
+      "machineIdentifier": 8366972,
+      "processIdentifier": 26815,
+      "counter": 14369292
+    },
+    "lastUpdated": 1516222025333,
+    "options": {
+      "password": "",
+      "scm": "Github",
+      "branch": "master",
+      "userID": "",
+      "url": "https://mygithub.com/Devopscode/SquashMerge"
+    },
+    "id": {
+      "timestamp": 1515082938,
+      "machineIdentifier": 3402793,
+      "processIdentifier": 27521,
+      "counter": 12817296
+    }
+  },
+  {
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": {
+      "timestamp": 1456084265,
+      "machineIdentifier": 8366972,
+      "processIdentifier": 26815,
+      "counter": 14369292
+    },
+    "lastUpdated": 1516222025759,
+    "options": {
+      "password": "",
+      "scm": "Github",
+      "branch": "master",
+      "userID": "",
+      "url": "https://mygithub.com/Devopscode/RebaseMerge"
+    },
+    "id": {
+      "timestamp": 1515082968,
+      "machineIdentifier": 3402793,
+      "processIdentifier": 27521,
+      "counter": 12817301
+    }
+  },
+  {
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": {
+      "timestamp": 1456084265,
+      "machineIdentifier": 8366972,
+      "processIdentifier": 26815,
+      "counter": 14369292
+    },
+    "lastUpdated": 1516222026134,
+    "options": {
+      "password": "",
+      "scm": "Github",
+      "branch": "master",
+      "userID": "",
+      "url": "https://mygithub.com/Devopscode/OpenForkPr"
+    },
+    "id": {
+      "timestamp": 1515082998,
+      "machineIdentifier": 3402793,
+      "processIdentifier": 27521,
+      "counter": 12817306
+    }
+  },
+  {
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": {
+      "timestamp": 1456084265,
+      "machineIdentifier": 8366972,
+      "processIdentifier": 26815,
+      "counter": 14369292
+    },
+    "lastUpdated": 1516222026476,
+    "options": {
+      "password": "",
+      "scm": "Github",
+      "branch": "master",
+      "userID": "",
+      "url": "https://mygithub.com/Devopscode/OpenBranchPr"
+    },
+    "id": {
+      "timestamp": 1515083026,
+      "machineIdentifier": 3402793,
+      "processIdentifier": 27521,
+      "counter": 12817311
+    }
+  },
+  {
+    "id": "5a678a032b7af20c95e7b146",
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": "56ca15297fab7c68bfdb420c",
+    "lastUpdated": 1516735761179,
+    "options": {
+      "password": "",
+      "scm": "Github",
+      "branch": "master",
+      "userID": "",
+      "url": "https://mygithub.com/Devopscode/MultipleAuthorsLGTM"
+    }
+  },
+  {
+    "id": "5a4e524333ec296b81c3935f",
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": "56ca15297fab7c68bfdb420c",
+    "lastUpdated": 1517029042023,
+    "options": {
+      "password": "",
+      "scm": "Github",
+      "branch": "master",
+      "userID": "",
+      "url": "https://mygithub.com/Devopscode/MultipleAuthorsGHR"
+    }
+  },
+   {
+    "id": "5ad5f605c23b391cfa1c01a4",
+    "description": "myapplication:mycomponent",
+    "enabled": false,
+    "errors": [],
+    "pushed": false,
+    "collectorId": "5af9ed53cba7165e8cc1069e",
+    "lastUpdated": 1524190250247,
+    "options": {
+      "applicationType": null,
+      "componentName": "mycomponent",
+      "applicationID": [
+        "SOMEAPPLICATION"
+      ],
+      "applicationName": "account-my-information",
+      "instanceUrl": "https://scan.com"
+    }
+  },
+  {
+    "id": "56e301107fab7c3ec3c43397",
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": "56ca15297fab7c68bfdb420c",
+    "lastUpdated": 1528709104212,
+    "options": {
+      "scm": "Github",
+      "branch": "develop",
+      "url": "https://mygithub.com/TechOriginations/openupf"
+    }
+  },
+  {
+    "id": "56e5919d7fab7c0244e33341",
+    "description": "openupf service parent",
+    "niceName": "HomeLoan",
+    "enabled": true,
+    "errors": [],
+    "pushed": true,
+    "collectorId": "56cb5bde7fab7c548551410e",
+    "lastUpdated": 1460387608894,
+    "options": {
+      "projectName": "openupf service parent",
+      "projectId": "111955",
+      "instanceUrl": "http://mysonar.com:11300/sonar"
+    }
+  },
+  {
+    "id": "57f2a0193b55670a9e06d63a",
+    "description": "TEST-UI",
+    "niceName": "TEST",
+    "enabled": true,
+    "errors": [],
+    "pushed": true,
+    "collectorId": "56df29df7fab7c3ec3c432ea",
+    "lastUpdated": 1513106044147,
+    "options": {
+      "jobName": "TEST-UI",
+      "jobUrl": "https://myjenkins.com/myjenkins/job/TEST-UI/",
+      "instanceUrl": "https://myjenkins.com/myjenkins/",
+      "applicationID": [
+        "TestBusServ"
+      ]
+    }
+  },
+  {
+    "id": "5b7b33d6b2ea1a4c58a61a2d",
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": "56ca15297fab7c68bfdb420c",
+    "lastUpdated": 1534804146907,
+    "options": {
+      "password": "",
+      "personalAccessToken": "",
+      "branch": "master",
+      "userID": "",
+      "url": "https://mygithub.com/Devopscode/HandleMisleadingSingleParentCommit"
+    }
+  },
+  {
+    "id": "5b87001e60bd8d3c47853f3d",
+    "_class": "com.capitalone.dashboard.model.GitHubRepo",
+    "enabled": true,
+    "errors": [],
+    "pushed": false,
+    "collectorId": "56ca15297fab7c68bfdb420c",
+    "lastUpdated": 1535574536694,
+    "options": {
+      "password": "",
+      "personalAccessToken": "",
+      "branch": "master",
+      "userID": "",
+      "url": "https://mygithub.com/Devopscode/NewPrOldCommit"
+    }
+  }
+]
\ No newline at end of file
diff --git a/collectors/audit/nfrr/src/test/resources/collectors/coll.json b/collectors/audit/nfrr/src/test/resources/collectors/coll.json
new file mode 100644
index 0000000000..73471ae600
--- /dev/null
+++ b/collectors/audit/nfrr/src/test/resources/collectors/coll.json
@@ -0,0 +1,214 @@
+[
+  {
+    "id" : "56cb5bde7fab7c548551410e",
+    "sonarVersions" : [
+      4.3,
+      5.3,
+      5.6,
+      6.7,
+      6.7
+    ],
+    "sonarMetrics" : [
+      "ncloc,line_coverage,violations,critical_violations,major_violations,blocker_violations,violations_density,sqale_index,test_success_density,test_failures,test_errors,tests",
+      "ncloc,line_coverage,violations,critical_violations,major_violations,blocker_violations,violations_density,sqale_index,test_success_density,test_failures,test_errors,tests",
+      "ncloc,violations,new_vulnerabilities,critical_violations,major_violations,blocker_violations,tests,test_success_density,test_errors,test_failures,coverage,line_coverage,sqale_index,alert_status,quality_gate_details",
+      "ncloc,violations,new_vulnerabilities,critical_violations,major_violations,blocker_violations,tests,test_success_density,test_errors,test_failures,coverage,line_coverage,sqale_index,alert_status,quality_gate_details",
+      "ncloc,violations,new_vulnerabilities,critical_violations,major_violations,blocker_violations,tests,test_success_density,test_errors,test_failures,coverage,line_coverage,sqale_index,alert_status,quality_gate_details"
+    ],
+    "name" : "Sonar",
+    "collectorType" : "CodeQuality",
+    "enabled" : true,
+    "online" : true,
+    "errors" : [
+    ],
+    "uniqueFields" : {
+      "projectName" : "",
+      "instanceUrl" : ""
+    },
+    "allFields" : {
+      "projectName" : "",
+      "projectId" : "",
+      "instanceUrl" : ""
+    },
+    "lastExecuted" : 1528709375907,
+    "searchFields" : [
+      "description"
+    ]
+  },
+  {
+    "name": "GitHub",
+    "collectorType": "SCM",
+    "enabled": true,
+    "online": true,
+    "errors": [],
+    "uniqueFields": {
+      "branch": "",
+      "url": ""
+    },
+    "allFields": {
+      "password": "",
+      "branch": "",
+      "userID": "",
+      "url": ""
+    },
+    "lastExecuted": 1516222026477,
+    "id": {
+      "timestamp": 1456084265,
+      "machineIdentifier": 8366972,
+      "processIdentifier": 26815,
+      "counter": 14369292
+    }
+  },
+  {
+    "name": "Eratocode",
+    "collectorType": "StaticSecurityScan",
+    "enabled": true,
+    "online": false,
+    "errors": [],
+    "uniqueFields": {
+      "applicationID": "",
+      "projectName": "",
+      "applicationName": "",
+      "instanceUrl": ""
+    },
+    "allFields": {
+      "applicationType": "",
+      "reportUrl": "",
+      "applicationID": "",
+      "projectName": "",
+      "applicationName": "",
+      "instanceUrl": ""
+    },
+    "lastExecuted": 1523562531181,
+    "id": {
+      "timestamp": 1456084266,
+      "machineIdentifier": 8366972,
+      "processIdentifier": 26815,
+      "counter": 14369292
+    }
+  },
+  {
+    "id": "5af9ed53cba7165e8cc1069e",
+    "eratocodeServers": [
+      "https://scan.com"
+    ],
+    "niceNames": [],
+    "name": "EratocodeOSS",
+    "collectorType": "LibraryPolicy",
+    "enabled": true,
+    "online": false,
+    "errors": [],
+    "uniqueFields": {
+      "componentName": "",
+      "applicationName": "",
+      "instanceUrl": ""
+    },
+    "allFields": {
+      "applicationType": "",
+      "componentName": "",
+      "applicationID": "",
+      "applicationName": "",
+      "instanceUrl": ""
+    },
+    "lastExecuted": 1518986735128,
+    "searchFields": [
+      "description"
+    ]
+  },
+  {
+    "_id" : "5a9efef85bcf7d3eb7d4bf85",
+    "name" : "JenkinsCucumberTest",
+    "collectorType" : "Test",
+    "enabled" : true,
+    "online" : true,
+    "errors" : [],
+    "uniqueFields" : {
+      "jobName" : "",
+      "jobUrl" : "",
+      "instanceUrl" : ""
+    },
+    "allFields" : {
+      "jobName" : "",
+      "jobUrl" : "",
+      "instanceUrl" : ""
+    },
+    "lastExecuted" : 1523388360308,
+    "searchFields" : [
+      "description"
+    ]
+  },
+  {
+    "_id" : "56df29df7fab7c3ec3c432ea",
+    "name" : "JenkinsCucumberTest",
+    "collectorType" : "Test",
+    "enabled" : true,
+    "online" : true,
+    "errors" : [],
+    "uniqueFields" : {
+      "jobName" : "",
+      "jobUrl" : "",
+      "instanceUrl" : ""
+    },
+    "allFields" : {
+      "jobName" : "",
+      "jobUrl" : "",
+      "instanceUrl" : ""
+    },
+    "lastExecuted" : 1522833838069,
+    "searchFields" : [
+      "description"
+    ]
+  },
+  {
+    "_id" : "597b9b0633681a4f1834646d",
+    "jobUrl" : "",
+    "name" : "JenkinsASRTest",
+    "collectorType" : "Test",
+    "enabled" : true,
+    "online" : false,
+    "errors" : [],
+    "uniqueFields" : {},
+    "allFields" : {},
+    "lastExecuted" : 1501381330234
+  },
+  {
+    "_id" : "57f2a0193b55670a9e06d63a",
+    "description" : "",
+    "niceName" : "COAF",
+    "enabled" : true,
+    "errors" : [
+    ],
+    "pushed" : true,
+    "collectorId" : "56df29df7fab7c3ec3c432ea",
+    "lastUpdated" : 1513106044147,
+    "options" : {
+      "jobName" : "",
+      "jobUrl" : "",
+      "instanceUrl" : ""
+    }
+  },
+  {
+    "id" : "56ca15297fab7c68bfdb420c",
+    "name" : "GitHub",
+    "collectorType" : "SCM",
+    "enabled" : true,
+    "online" : true,
+    "errors" : [
+    ],
+    "uniqueFields" : {
+      "branch" : "",
+      "url" : ""
+    },
+    "allFields" : {
+      "password" : "",
+      "personalAccessToken" : "",
+      "branch" : "",
+      "userID" : "",
+      "url" : ""
+    },
+    "lastExecuted" : 1528709433703,
+    "searchFields" : [
+      "description"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/collectors/audit/nfrr/src/test/resources/component/component.json b/collectors/audit/nfrr/src/test/resources/component/component.json
new file mode 100644
index 0000000000..669aad63b2
--- /dev/null
+++ b/collectors/audit/nfrr/src/test/resources/component/component.json
@@ -0,0 +1,103 @@
+{
+  "name": "TestAudit",
+  "id": "5982430ef6c08708ca6c7f49",
+  "collectorItems": {
+    "SCM": [
+      {
+        "id":"56e301107fab7c3ec3c43397",
+        "enabled": true,
+        "errors": [],
+        "pushed": false,
+        "collectorId": "56ca15297fab7c68bfdb420c",
+        "lastUpdated": 0,
+        "options": {
+          "password": "",
+          "scm": "Github",
+          "branch": "master",
+          "userID": "",
+          "url": "https://mygithub.com/one/two"
+        }
+      }
+    ],
+    "StaticSecurityScan": [
+      {
+        "enabled": true,
+        "errors": [],
+        "pushed": false,
+        "collectorId": {
+          "timestamp": 1522773350945,
+          "machineIdentifier": 1084966,
+          "processIdentifier": 27772,
+          "counter": 16289003
+        },
+        "lastUpdated": 1522773350945,
+        "options": {
+          "applicationType": "Desktop",
+          "reportUrl": "https://appsec.com",
+          "applicationID": [
+            "TestBusServ"
+          ],
+          "projectName": "cust-service",
+          "applicationName": "customer-service",
+          "instanceUrl": "https://appsec.com"
+        },
+        "id": "5b4e524333ec296b81c3935f"
+      }
+    ],
+    "LibraryPolicy" : [
+      {
+        "id": "5ad5f605c23b391cfa1c01a4",
+        "description": "myapplication:mycomponent",
+        "enabled": false,
+        "errors": [],
+        "pushed": false,
+        "collectorId": "5ad4c71841a34c9696cdfa2e",
+        "lastUpdated": 1524190250247,
+        "options": {
+          "applicationType": null,
+          "componentName": "mycomponent",
+          "applicationID": [
+            "SOMEAPPLICATION"
+          ],
+          "applicationName": "account-my-information",
+          "instanceUrl": "https://scan.com"
+        }
+      }
+    ],
+    "Test" : [
+      {
+        "id" : "57f2a0193b55670a9e06d63a",
+        "description" : "Functional-SLATE",
+        "niceName" : "ABCD",
+        "enabled" : true,
+        "errors" : [
+        ],
+        "pushed" : true,
+        "collectorId" : "56df29df7fab7c3ec3c432ea",
+        "lastUpdated" : 1513106044147,
+        "options" : {
+          "jobName" : "Functional-SLATE",
+          "jobUrl" : "https://myjenkins.com/jenkins/job/Functional-SLATE/",
+          "instanceUrl" : "https://myjenkins.com/jenkins/"
+        }
+      }
+    ],
+    "CodeQuality" : [
+      {
+        "id" : "56e5919d7fab7c0244e33341",
+        "description" : "openupf-hldirect service parent",
+        "niceName" : "HomeLoan",
+        "enabled" : true,
+        "pushed" : true,
+        "collectorId" : "56cb5bde7fab7c548551410e",
+        "lastUpdated" : 1458247537167,
+        "options" : {
+          "projectName" : "openupf-hldirect service parent",
+          "projectId" : "111955",
+          "instanceUrl" : "http://mysonar.com/sonar"
+        }
+      }
+    ]
+  }
+
+}
\ No newline at end of file
diff --git a/collectors/audit/nfrr/src/test/resources/dashboard/dashboard.json b/collectors/audit/nfrr/src/test/resources/dashboard/dashboard.json
new file mode 100644
index 0000000000..83dcf27733
--- /dev/null
+++ b/collectors/audit/nfrr/src/test/resources/dashboard/dashboard.json
@@ -0,0 +1,71 @@
+{
+  "_id" : "5982430ef6c08708ca6c7f4a",
+  "template" : "capone",
+  "title" : "auditTestDashboard",
+  "widgets" : [
+    {
+      "_id" : "59889bb9f6c08708ca6c8a79",
+      "name" : "feature",
+      "componentId" : "5982430ef6c08708ca6c7f49",
+      "options" : {
+        "sprintType" : "scrum",
+        "featureTool" : "Jira",
+        "showStatus" : {
+          "kanban" : false,
+          "scrum" : true
+        },
+        "id" : "feature0",
+        "projectName" : "Delivery Transformation Tools",
+        "projectId" : "12828",
+        "estimateMetricType" : "storypoints",
+        "listType" : "epics"
+      }
+    },
+    {
+      "_id" : "5988c546f6c08708ca6c8b21",
+      "name" : "build",
+      "componentId" : "5982430ef6c08708ca6c7f49",
+      "options" : {
+        "id" : "build0",
+        "buildDurationThreshold" : 3,
+        "consecutiveFailureThreshold" : 5
+      }
+    },
+    {
+      "_id" : "5acfafeaca0bc905a14da5da",
+      "name" : "performanceanalysis",
+      "componentId" : "5982430ef6c08708ca6c7f49",
+      "options" : {
+        "id" : "performance0"
+      }
+    },
+    {
+      "_id" : "5acfb01bca0bc905a14da5db",
+      "name" : "codeanalysis",
+      "componentId" : "5982430ef6c08708ca6c7f49",
+      "options" : {
+        "id" : "codeanalysis0",
+        "testJobNames" : [
+          "Name1"
+        ]
+      }
+    }
+  ],
+  "owners" : [
+    {
+      "username" : "praveen",
+      "authType" : "LDAP"
+    }
+  ],
+  "type" : "Team",
+  "application" : {
+    "name" : "Hygieia",
+    "components" : [
+    ]
+  },
+  "validServiceName" : "TestBusServ",
+  "validAppName" : "confItem",
+  "remoteCreated" : false,
+  "scoreEnabled" : false,
+  "scoreDisplay" : "HEADER"
+}
diff --git a/core/src/main/java/com/capitalone/dashboard/model/AuditResult.java b/core/src/main/java/com/capitalone/dashboard/model/AuditResult.java
new file mode 100644
index 0000000000..8fad3ca0a7
--- /dev/null
+++ b/core/src/main/java/com/capitalone/dashboard/model/AuditResult.java
@@ -0,0 +1,145 @@
+package com.capitalone.dashboard.model;
+
+import org.bson.types.ObjectId;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+@Document(collection = "audit_results")
+public class AuditResult extends BaseModel {
+
+    private ObjectId dashboardId;
+    private String dashboardTitle;
+    private String lineOfBusiness;
+    private String configItemBusServName;
+    private String configItemBusAppName;
+    private String configItemBusServOwner;
+    private String configItemBusAppOwner;
+    private AuditType auditType;
+    private String auditTypeStatus;
+    private String auditStatus;
+    private String url;
+    private String auditDetails;
+    private long timestamp;
+
+    @SuppressWarnings("PMD.ExcessiveParameterList")
+    public AuditResult(ObjectId dashboardId, String dashboardTitle, String lineOfBusiness, String configItemBusServName,
+                       String configItemBusAppName, String configItemBusServOwner, String configItemBusAppOwner, AuditType auditType,
+                       String auditTypeStatus, String auditStatus, String auditDetails, String url, long timestamp) {
+        this.dashboardId = dashboardId;
+        this.dashboardTitle = dashboardTitle;
+        this.lineOfBusiness = lineOfBusiness;
+        this.configItemBusServName = configItemBusServName;
+        this.configItemBusAppName = configItemBusAppName;
+        this.configItemBusServOwner = configItemBusServOwner;
+        this.configItemBusAppOwner = configItemBusAppOwner;
+        this.auditType = auditType;
+        this.auditTypeStatus = auditTypeStatus;
+        this.auditStatus = auditStatus;
+        this.url = url;
+        this.auditDetails = auditDetails;
+        this.timestamp = timestamp;
+    }
+
+    public ObjectId getDashboardId() {
+        return dashboardId;
+    }
+
+    public void setDashboardId(ObjectId dashboardId) {
+        this.dashboardId = dashboardId;
+    }
+
+    public String getDashboardTitle() {
+        return dashboardTitle;
+    }
+
+    public void setDashboardTitle(String dashboardTitle) {
+        this.dashboardTitle = dashboardTitle;
+    }
+
+    public String getLineOfBusiness() {
+        return lineOfBusiness;
+    }
+
+    public void setLineOfBusiness(String lineOfBusiness) {
+        this.lineOfBusiness = lineOfBusiness;
+    }
+
+    public String getConfigItemBusServName() {
+        return configItemBusServName;
+    }
+
+    public void setConfigItemBusServName(String configItemBusServName) {
+        this.configItemBusServName = configItemBusServName;
+    }
+
+    public String getConfigItemBusAppName() {
+        return configItemBusAppName;
+    }
+
+    public void setConfigItemBusAppName(String configItemBusAppName) {
+        this.configItemBusAppName = configItemBusAppName;
+    }
+
+    public String getConfigItemBusServOwner() {
+        return configItemBusServOwner;
+    }
+
+    public void setConfigItemBusServOwner(String configItemBusServOwner) {
+        this.configItemBusServOwner = configItemBusServOwner;
+    }
+
+    public String getConfigItemBusAppOwner() {
+        return configItemBusAppOwner;
+    }
+
+    public void setConfigItemBusAppOwner(String configItemBusAppOwner) {
+        this.configItemBusAppOwner = configItemBusAppOwner;
+    }
+
+    public AuditType getAuditType() {
+        return auditType;
+    }
+
+    public void setAuditType(AuditType auditType) {
+        this.auditType = auditType;
+    }
+
+    public String getAuditTypeStatus() {
+        return auditTypeStatus;
+    }
+
+    public void setAuditTypeStatus(String auditTypeStatus) {
+        this.auditTypeStatus = auditTypeStatus;
+    }
+
+    public String getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getAuditDetails() {
+        return auditDetails;
+    }
+
+    public void setAuditDetails(String auditDetails) {
+        this.auditDetails = auditDetails;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+}
\ No newline at end of file
diff --git a/api-audit/src/main/java/com/capitalone/dashboard/model/AuditType.java b/core/src/main/java/com/capitalone/dashboard/model/AuditType.java
similarity index 100%
rename from api-audit/src/main/java/com/capitalone/dashboard/model/AuditType.java
rename to core/src/main/java/com/capitalone/dashboard/model/AuditType.java
diff --git a/core/src/main/java/com/capitalone/dashboard/model/CollectorType.java b/core/src/main/java/com/capitalone/dashboard/model/CollectorType.java
index 5aad1b5008..abde99959d 100644
--- a/core/src/main/java/com/capitalone/dashboard/model/CollectorType.java
+++ b/core/src/main/java/com/capitalone/dashboard/model/CollectorType.java
@@ -27,7 +27,8 @@ public enum CollectorType {
     AppPerformance,
     InfraPerformance,
     Score,
-    TEAM;
+    TEAM,
+    Audit;
 
     public static CollectorType fromString(String value) {
         for (CollectorType collectorType : values()) {
diff --git a/core/src/main/java/com/capitalone/dashboard/repository/AuditResultRepository.java b/core/src/main/java/com/capitalone/dashboard/repository/AuditResultRepository.java
new file mode 100644
index 0000000000..79d1de9de6
--- /dev/null
+++ b/core/src/main/java/com/capitalone/dashboard/repository/AuditResultRepository.java
@@ -0,0 +1,20 @@
+package com.capitalone.dashboard.repository;
+
+import com.capitalone.dashboard.model.AuditResult;
+import com.capitalone.dashboard.model.AuditType;
+import org.bson.types.ObjectId;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+public interface AuditResultRepository extends PagingAndSortingRepository<AuditResult, ObjectId> {
+
+    AuditResult findById(ObjectId id);
+    Page<AuditResult> findByAuditType(AuditType auditType, Pageable pageable);
+    Iterable<AuditResult> findByDashboardTitle(String dashboardTitle);
+    Iterable<AuditResult> findByDashboardTitleAndAuditType(String dashboardTitle, AuditType auditType);
+    Iterable<AuditResult> findByConfigItemBusServNameAndConfigItemBusAppName(String configItemBusServName, String configItemBusAppName);
+    Iterable<AuditResult> findByConfigItemBusServNameAndConfigItemBusAppNameAndAuditType(String configItemBusServName, String configItemBusAppName, AuditType auditType);
+    Page<AuditResult> findByLineOfBusiness(String lineOfBusiness, Pageable pageable);
+    Page<AuditResult> findByLineOfBusinessAndAuditType(String lineOfBusiness, AuditType auditType, Pageable pageable);
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/capitalone/dashboard/repository/DashboardRepository.java b/core/src/main/java/com/capitalone/dashboard/repository/DashboardRepository.java
index 86a1b78f09..c0b03d6a88 100644
--- a/core/src/main/java/com/capitalone/dashboard/repository/DashboardRepository.java
+++ b/core/src/main/java/com/capitalone/dashboard/repository/DashboardRepository.java
@@ -67,4 +67,5 @@ public interface DashboardRepository extends PagingAndSortingRepository<Dashboar
 	Page<Dashboard> findByOwnersAndTitleContainingIgnoreCase(Owner owner, String title, Pageable pageable);
 	Page<Dashboard> findByOwnersAndTypeContainingIgnoreCaseAndTitleContainingIgnoreCase(Owner owner, String type, String title, Pageable pageable);
 
+	Iterable<Dashboard> findAllByType(DashboardType dashboardType);
 }
diff --git a/api-audit/src/main/java/com/capitalone/dashboard/status/BuildAuditStatus.java b/core/src/main/java/com/capitalone/dashboard/status/BuildAuditStatus.java
similarity index 100%
rename from api-audit/src/main/java/com/capitalone/dashboard/status/BuildAuditStatus.java
rename to core/src/main/java/com/capitalone/dashboard/status/BuildAuditStatus.java
diff --git a/api-audit/src/main/java/com/capitalone/dashboard/status/CodeQualityAuditStatus.java b/core/src/main/java/com/capitalone/dashboard/status/CodeQualityAuditStatus.java
similarity index 100%
rename from api-audit/src/main/java/com/capitalone/dashboard/status/CodeQualityAuditStatus.java
rename to core/src/main/java/com/capitalone/dashboard/status/CodeQualityAuditStatus.java
diff --git a/api-audit/src/main/java/com/capitalone/dashboard/status/CodeReviewAuditStatus.java b/core/src/main/java/com/capitalone/dashboard/status/CodeReviewAuditStatus.java
similarity index 100%
rename from api-audit/src/main/java/com/capitalone/dashboard/status/CodeReviewAuditStatus.java
rename to core/src/main/java/com/capitalone/dashboard/status/CodeReviewAuditStatus.java
diff --git a/api-audit/src/main/java/com/capitalone/dashboard/status/DashboardAuditStatus.java b/core/src/main/java/com/capitalone/dashboard/status/DashboardAuditStatus.java
similarity index 100%
rename from api-audit/src/main/java/com/capitalone/dashboard/status/DashboardAuditStatus.java
rename to core/src/main/java/com/capitalone/dashboard/status/DashboardAuditStatus.java
diff --git a/api-audit/src/main/java/com/capitalone/dashboard/status/LibraryPolicyAuditStatus.java b/core/src/main/java/com/capitalone/dashboard/status/LibraryPolicyAuditStatus.java
similarity index 100%
rename from api-audit/src/main/java/com/capitalone/dashboard/status/LibraryPolicyAuditStatus.java
rename to core/src/main/java/com/capitalone/dashboard/status/LibraryPolicyAuditStatus.java
diff --git a/api-audit/src/main/java/com/capitalone/dashboard/status/PerformanceTestAuditStatus.java b/core/src/main/java/com/capitalone/dashboard/status/PerformanceTestAuditStatus.java
similarity index 100%
rename from api-audit/src/main/java/com/capitalone/dashboard/status/PerformanceTestAuditStatus.java
rename to core/src/main/java/com/capitalone/dashboard/status/PerformanceTestAuditStatus.java
diff --git a/api-audit/src/main/java/com/capitalone/dashboard/status/TestResultAuditStatus.java b/core/src/main/java/com/capitalone/dashboard/status/TestResultAuditStatus.java
similarity index 100%
rename from api-audit/src/main/java/com/capitalone/dashboard/status/TestResultAuditStatus.java
rename to core/src/main/java/com/capitalone/dashboard/status/TestResultAuditStatus.java
diff --git a/pom.xml b/pom.xml
index 63487857d9..8b9ecfc391 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,6 +183,7 @@
         <module>core</module>
         <module>api</module>
         <module>api-audit</module>
+        <module>collectors/audit/nfrr</module>
         <module>collectors/feature/rally</module>
         <module>collectors/artifact/artifactory</module>
         <module>collectors/build/bamboo</module>
@@ -233,6 +234,7 @@
         <module>api</module>
         <module>api-audit</module>
         <module>collectors/artifact/artifactory</module>
+        <module>collectors/audit/nfrr</module>
         <module>collectors/build/bamboo</module>
         <module>collectors/build/jenkins</module>
         <module>collectors/build/jenkins-cucumber</module>