diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index 2cc9d16..91c1204 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -1,21 +1,4 @@
 <?php
-/**
- * Copyright (c) 2018 original UTS CIC. Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Contributors:
- * UTS Connected Intelligence Centre
- */
-
-
 
 namespace App\Http\Controllers;
 
diff --git a/app/Http/Controllers/AnalyseController.php b/app/Http/Controllers/AnalyseController.php
index be24421..b809545 100644
--- a/app/Http/Controllers/AnalyseController.php
+++ b/app/Http/Controllers/AnalyseController.php
@@ -1,19 +1,4 @@
 <?php
-/**
- * Copyright (c) 2018 original UTS CIC. Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Contributors:
- * UTS Connected Intelligence Centre
- */
 
 namespace App\Http\Controllers;
 
diff --git a/app/Http/Controllers/AssignmentController.php b/app/Http/Controllers/AssignmentController.php
index 9c24035..e69709d 100644
--- a/app/Http/Controllers/AssignmentController.php
+++ b/app/Http/Controllers/AssignmentController.php
@@ -23,7 +23,7 @@ public function __construct() {
 
     public function index(){
         //get all assignments belonging to the user
-        $assignments = User::find(Auth::user()->id)->assignments()->with('feature')->get();
+        $assignments = User::find(Auth::user()->id)->assignments()->with('feature')->orderBy('created_at','desc')->get();
         $features_all = Feature::all();
         $features = new \stdClass();
 
diff --git a/app/Http/Controllers/DocumentController.php b/app/Http/Controllers/DocumentController.php
index 5f4863e..29fe744 100644
--- a/app/Http/Controllers/DocumentController.php
+++ b/app/Http/Controllers/DocumentController.php
@@ -1,19 +1,4 @@
 <?php
-/**
- * Copyright (c) 2018 original UTS CIC. Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Contributors:
- * UTS Connected Intelligence Centre
- */
 
 namespace App\Http\Controllers;
 
diff --git a/app/Http/Controllers/ExampleController.php b/app/Http/Controllers/ExampleController.php
index 56ad7c5..0407c5e 100644
--- a/app/Http/Controllers/ExampleController.php
+++ b/app/Http/Controllers/ExampleController.php
@@ -1,19 +1,4 @@
 <?php
-/**
- * Copyright (c) 2018 original UTS CIC. Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Contributors:
- * UTS Connected Intelligence Centre
- */
 
 namespace App\Http\Controllers;
 
diff --git a/app/Http/Controllers/FeedbackController.php b/app/Http/Controllers/FeedbackController.php
index f461665..2dd2ac3 100644
--- a/app/Http/Controllers/FeedbackController.php
+++ b/app/Http/Controllers/FeedbackController.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Project: AcaWriter
+ *
+ * Copyright(c)2018 original University of Technology Sydney.
+ * Licensed under the Apache License, Version2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and limitations under the License.
+ *
+ *  Contributor(s):
+ *  UTS Connected Intelligence Centre
+ */
 
 namespace App\Http\Controllers;
 
@@ -10,15 +29,20 @@
 use Illuminate\Support\Facades\Hash;
 use Auth;
 use App\User;
-use App\Http\Controllers\StringTokenizer;
+//use App\Http\Controllers\StringTokenizer;
+use App\Services\Analyser;
 use App\Feature;
 use App\Draft;
 use App\Events\UserActivity;
-
+use App\Traits\Profiler;
+use App\Traits\Analytical\Cars;
+use App\Traits\Analytical\Accounts;
+use App\Traits\Analytical\Law;
 
 
 class FeedbackController extends Controller
 {
+    use Profiler, Cars, Accounts, Law;
 
 
     public  $graphQLURL = "";
@@ -33,7 +57,8 @@ public function __construct()
     {
         $this->middleware('auth');
         $this->client = new Client($this->graphQLURL);
-        $this->stringTokeniser = new StringTokenizer();
+       // $this->stringTokeniser = new StringTokenizer();
+        $this->analyser = new Analyser();
         $this->graphQLURL = env('TAP_API', ''). "/graphql";
     }
 
@@ -52,6 +77,7 @@ public function generateFeedback(Request $request) {
         $activityLog->status = 'success';
         $activityLog->data =[];
         $user_id = Auth::user()->id;
+        $result = new \stdClass();
 
         if($request['action'] == 'quick') {
             //single sentence change analysis
@@ -62,7 +88,7 @@ public function generateFeedback(Request $request) {
             $data = array();
             $data['txt'] = $request['txt'];
             $data['grammar'] = $request['extra']['grammar'];
-            $temp = $this->stringTokeniser->quickTapMoves($data);
+            $temp = $this->analyser->quickTapMoves($data);
             $tt['str']= $temp->str ? $temp->str : '';
             $tt['raw_tags'] = $temp->raw_tags? $temp->raw_tags : array();
             $tt['tags'] = $temp->tags? $temp->tags:'';
@@ -74,13 +100,14 @@ public function generateFeedback(Request $request) {
         } */
         else if($request['action'] == 'fetch') {
             Log::info('moves',['execute time : ' =>'started'.date('d/m/y:H:i:s') ]);
-            $tap = $this->stringTokeniser->preProcess($request);
+            $tap = $this->analyser->preProcess($request);
+            $result->tap = $tap;
 
             Log::info('tokeniser',['tokeniser' =>'completed'.date('d/m/y:H:i:s') ]);
         }
 
 
-        $result = new \stdClass();
+
         $extra = $request["extra"];
         $result->status = array('message' => 'Success', 'code' => 200  );
         $result->rules = array();
@@ -221,365 +248,10 @@ protected function getFeedbackSchema($path, $id)
     }
 
 
-
-    protected function background($tap, $rule) {
-        $result = array();
-        $check = $rule['check'];
-        $tempo = 0;
-
-        foreach($tap as $key => $data) {
-            $setFeed = new \stdClass();
-            $setFeed->str = $data->str;
-            $setFeed->message = array();
-            $setFeed->css = array();
-            if ($key < $check['paragraph'] && count($data->raw_tags) > 0) {
-                if (in_array($check['paragraph'], $data->raw_tags)) {
-                    $tempo++;
-                }
-            }
-        }
-
-        if ($tempo == 0 && $key == $this->para - 1) {
-            $setFeed->message['background'] = $rule['message'];
-            $setFeed->css[] = 'background';
-            $result[] = $setFeed;
-        }
-
-        return $result;
-    }
-
-    protected function metrics($tap, $rule) {
-        $result = array();
-        $check = $rule['check'];
-
-        foreach($tap as $key => $data) {
-            $tempStore = new \stdClass();
-            $tempStore->str = $data->str;
-            $tempStore->message = array();
-            $tempStore->css = array();
-            $returnData = $this->stringTokeniser->metrics($data->str);
-            if(isset($returnData->sentWordCounts)) {
-                //sentWordCounts is always an array e.g. [5,6] if two sentences sent here we send only one at a time though
-                if($returnData->sentWordCounts[0] > $check['sentenceWordCount']) {
-                    //$tempStore->message = $rule['message'];
-                    foreach($rule['message'] as $msg) {
-                        if(isset($msg['metrics'])) {
-                            $tempStore->message['metrics'] = $msg['metrics'];
-                            array_push($tempStore->css, 'metrics');
-                        }
-                    }
-                }
-            }
-            $result[] = $tempStore;
-        }
-        return $result;
-
-    }
-
-
-    /*
-     * function works on the complete text at once, so input is not tokenised
-     * so str = append all tokenised tap outputs into one
-     */
-
-    protected function vocab($tap, $rule) {
-        $result = array();
-        $check = $rule['check'];
-        $termCount = 0;
-        $words = $check['words'];
-        $completeText = "";
-
-        foreach($tap as $key => $data) {
-            $completeText .= $data->str;
-        }
-        $tempStore = new \stdClass();
-        $tempStore->str = $completeText;
-        $tempStore->message = array();
-        $tempStore->css =array();
-
-            $returnData = $this->stringTokeniser->vocab($tempStore->str);
-            if(isset($returnData->terms)) {
-                $collection = collect($returnData->terms);
-
-                foreach($check['words'] as $word) {
-                    $filtered= $collection->where('term', $word);
-                    if(count($filtered->all()) == 0) $termCount++;
-                }
-
-                if($termCount > 0 ) {
-                    foreach($rule['message'] as $msg) {
-                        if(isset($msg['metrics'])) {
-                            $tempStore->message['vocab'] = $msg['vocab'];
-                            $tempStore->css[] = 'vocab';
-                        }
-                    }
-                    $result[] = $tempStore;
-                }
-            }
-
-        return $result;
-    }
-
-    /*
-     * *** applicable only for reflective feedback
-     */
-
-    protected function expression($tap, $rule) {
-        $result = array();
-        $check = $rule['check'];
-        $termCount = 0;
-        $all = $check['all'];
-
-
-        if(count($all) == 0) {
-            return $result;
-        }
-
-
-        foreach($tap as $key => $data) {
-            $tempStore = new \stdClass();
-            $tempStore->str = $data->str;
-            $tempStore->message = array();
-            $tempStore->affect=array();
-            $tempStore->epistemic=array();
-            $tempStore->modal=array();
-            $tempStore->css = array();
-
-            $returnData = $this->stringTokeniser->expression($data->str);
-            //$returnData is an array but since we are analysing tokenised strings we can safetly assume array[0]
-            $sanitizedResult = $returnData[0];
-            //$tempStore->raw = $sanitizedResult;
-            foreach($all as $exp) {
-
-                if (isset($sanitizedResult->{$exp}) && count($sanitizedResult->{$exp}) > 0) {
-                    $tempStore->{$exp} = $sanitizedResult->{$exp};
-                    foreach($rule['message'] as $msg) {
-                        if(isset($msg[$exp])) {
-                            $tempStore->message[$exp] = $msg[$exp];
-                            array_push($tempStore->css, $exp);
-                        }
-                    }
-                }
-            }
-
-            $result[] = $tempStore;
-        }
-
-
-        return $result;
-
-    }
-
-
-    protected function moves($tap, $rule) {
-
-        $result = array();
-        $check = $rule['check'];
-        $tempo = 0;
-        $tags = $check['tags'];
-        $messages = $rule['message'];
-        if(count($tags) == 0) {
-            return $result;
-        }
-
-        foreach($tap as $key => $data) {
-            $setFeed = new \stdClass();
-            $setFeed->str = $data->str;
-            $setFeed->message = array();
-            $setFeed->css = array();
-
-            foreach($tags as $tag) {
-                if(count(preg_grep("[^".$tag."]", $data->raw_tags)) > 0) {
-                    foreach($messages as $msg) {
-                        if(isset($msg[$tag])) {
-                            $setFeed->message[$tag] = $msg[$tag];
-                            array_push($setFeed->css,$tag);
-                        }
-                    }
-                }
-            }
-            $result[] = $setFeed;
-        }
-
-        return $result;
-    }
-
-
     /**
-     * -- crafted this to cover sophies CARS rules, all the rules guided by features
-     * @param $tap - all tags per specified calls
-     * @param $rule - fulled from selected feature
-     * @return array - returns missing tags
-     *                         moves1, move2, move3 precedence orders and messages if not followed
+     *  applicable only for reflective feedback
      */
 
-    protected function enforced($tap, $rule) {
-        $result = array();
-        $check = $rule['check'];
-        $tempo = 0;
-        $tags = $check['tags'];
-        $messages = $rule['message'];
-        if(count($tags) == 0) {
-            return $result;
-        }
-        $monitor = array();
-        $issues = array();
-
-        if($rule["tabEval"] === 'dynamic') {
-
-
-            foreach ($tap as $key => $data) {
-                $setFeed = new \stdClass();
-                $setFeed->str = $data->str;
-                $setFeed->message = array();
-                $setFeed->css = array();
-                $setFeed->interim = array();
-
-                $temp = array();
-                foreach ($tags as $it => $case) {
-                    foreach ($case as $k => $tag) {
-                        if (count(array_intersect($tag, $data->raw_tags)) > 0) {
-                            $temp[] = $k;
-                        }
-                    }
-                }
-
-                if (count($temp) > 0) {
-                    arsort($temp);
-                    $sorted = array_unique($temp);
-                    // print_r(current($sorted));
-                    array_push($monitor, current($sorted));
-                }
-            }
-
-            foreach ($monitor as $key => $d) {
-                if (isset($monitor[$key + 1])) {
-                    $pre = $monitor[$key];
-                    $next = $monitor[$key + 1];
-                    $idx = $pre.$next;
-                    if ($pre > $next) {
-                        foreach ($messages as $msg) {
-                            if (isset($msg['problem' . $idx])) array_push($issues, $msg['problem' . $idx]);
-                        }
-                    }
-                }
-            }
-
-           // print_r($issues);
-
-            //check for missing moves
-            $unique_moves = array_unique($monitor);
-            //print_r($unique_moves);
-            foreach (array(1, 2, 3) as $move) {
-                if (!in_array($move, $unique_moves)) {
-                    foreach ($messages as $msg) {
-                        if (isset($msg['missing' . $move])) array_push($issues, $msg['missing' . $move]);
-                    }
-                }
-            }
-
-
-        } else {
-            foreach($messages as $key => $msg) {
-                array_push($issues, $msg);
-            }
-        }
-
-        array_push($result, $issues);
-        //print_r($result);
-        return $result;
-    }
-
-    protected function missingTags($tap, $rule) {
-        $result = array();
-        $check = $rule['check'];
-        $tempo = 0;
-        $tags = $check['tags'];
-        $messages = $rule['message'];
-        if(count($tags) == 0) {
-            return $result;
-        }
-        $monitor = array();
-        $issues = array();
-
-        if($rule["tabEval"] === 'dynamic') {
-
-            $temp = array();
-            foreach ($tap as $key => $data) {
-               $temp = array_merge($temp, $data->raw_tags);
-            }
-
-            $temp = array();
-            $temp_temp =array();
-            foreach ($tap as $key => $data) {
-                $temp_temp = array_merge($temp_temp, $data->raw_tags);
-            }
-
-            /***
-             * hacky stuff that violates the flow of rules - for Shibani....
-             * if contrast and question present don't add error
-             * else if neither of them present show  error
-             * solution replace all contrast tags with question and check for question(nostat)
-             * if present don't error else error!!!!
-             ***/
-
-            foreach($temp_temp as $v) {
-                if($v=='contrast') { array_push($temp, 'nostat');}
-                else { array_push($temp, $v); }
-            }
-
-            $monitor = array_unique($temp);
-            
-            foreach ($tags as  $d) {
-                if (!in_array($d, $monitor)) {
-                    foreach ($messages as $msg) {
-                        if (isset($msg[$d])) array_push($issues, $msg[$d]);
-                    }
-                }
-            }
-
-
-        } else {
-            foreach($messages as $key => $msg) {
-                array_push($issues, $msg);
-            }
-        }
-
-        array_push($result, $issues);
-        //print_r($result);
-        return $result;
-    }
-
-
-
-
-
-
-
-
-    protected function staticFeed($tap, $rule) {
-        $result = array();
-        $check = $rule['check'];
-        $tempo = 0;
-        $tags = $check['tags'];
-        $messages = $rule['message'];
-
-        $monitor = array();
-        $issues = array();
-
-        if($rule["tabEval"] === 'dynamic') {
-
-        } else {
-            foreach($messages as $key => $msg) {
-                array_push($issues, $msg['txt']);
-            }
-        }
-        array_push($result, $issues);
-        return $result;
-    }
-
-
-
 
      protected function formatFeedback($tap, $result) {
         $final = array();
@@ -609,8 +281,6 @@ protected function formatFeedback($tap, $result) {
         return $final;
 
 
-
-
     }
 
 
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 645d26d..1e7b45c 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -1,19 +1,4 @@
 <?php
-/**
- * Copyright (c) 2018 original UTS CIC. Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Contributors:
- * UTS Connected Intelligence Centre
- */
 
 namespace App\Http\Controllers;
 
diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index bb2e4d7..39f0334 100644
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -1,19 +1,4 @@
 <?php
-/**
- * Copyright (c) 2018 original UTS CIC. Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Contributors:
- * UTS Connected Intelligence Centre
- */
 
 namespace App\Http\Controllers;
 
diff --git a/app/Http/Controllers/PdfGeneratorController.php b/app/Http/Controllers/PdfGeneratorController.php
index 3da825b..65fc78f 100644
--- a/app/Http/Controllers/PdfGeneratorController.php
+++ b/app/Http/Controllers/PdfGeneratorController.php
@@ -9,23 +9,199 @@
 
 class PdfGeneratorController extends Controller
 {
+    private $checks;
 
-    public function pdfview ($ref= NULL) {
-        PDF::setOptions(['dpi' => 150]);
 
+    public function __construct()
+    {
+        $this->checks = new \stdClass();
+        $this->checks->reflective = new \stdClass();
+        $this->checks->analytical = new \stdClass();
+
+        //reflective def's
+            $this->checks->reflective->icons = array(
+                "context",
+                "challenge",
+                "change",
+                "metrics"
+            );
+
+            //affect tag validity criteria
+            $this->checks->reflective->affect_validity = array(
+                "context",
+                "challenge",
+                "change"
+            );
+
+            //inline text replacement tags
+            $this->checks->reflective->inlineTxt = array(
+                "affect"    => "affect",
+                "epistemic" => "epistemic",
+                "modal"     => "modall"
+            );
+
+        //analytical defs
+            $this->checks->analytical->analytic_xlator = array(
+                "metrics" => "metrics",
+                "emph" =>  "E",
+                "grow" =>  "T",
+                "contrast" => "C",
+                "contribution" => "S",
+                "nostat" => "Q",
+                "tempstat" => "B",
+                "novstat"=> "N",
+                "surprise"=>"S",
+                "attitude"=> "P"
+            );
+            $this->checks->analytical->moves_css = array(
+                "moves1",
+                "moves2",
+                "moves3"
+            );
 
 
+    }
+
+    public function pdfview ($ref= NULL) {
+        PDF::setOptions(['dpi' => 96, 'defaultFont' => 'arial']);
+
         if($ref) {
-            $draft = Draft::where('id',$ref)->get();
+            $encoded_data = json_decode($ref);
+            $document_id = $encoded_data->id/123456; //document Id
+            $id = Draft::where('document_id', $document_id)->get()->max('id');
+
+            if(!$id) {
+                return redirect()->back()->with('error', 'This document does not have any feedback associated with it.');
+            }
+
+            $draft = Draft::where('id',$id)->get();
             $draft[0]->raw = json_decode($draft[0]->raw_response);
-            // dd($draft[0]->raw);
-            view()->share('draft', $draft[0]);
-            $pdf = PDF::loadView('pdf.view');
+           // dd($draft[0]->raw);
+            $pdfOut = new \stdClass();
+            $pdfOut->raw = $draft[0]->raw;
+            $pdfOut->annotated = $this->getAnnotation($draft[0]->raw, $encoded_data->grammar);
+            $pdfOut->name = $encoded_data->name;
+            $pdfOut->grammar = strtoupper($encoded_data->grammar);
+            $pdfOut->original = $draft[0]->text_input;
+            $pdfOut->created_at = $draft[0]->created_at;
+
+            //dd($pdfOut);
 
+            view()->share('draft', $pdfOut);
+           if($encoded_data->grammar =='analytical') {
+               $pdf = PDF::loadView('pdf.analytical');
+           }
+            if($encoded_data->grammar =='reflective') {
+                $pdf = PDF::loadView('pdf.reflective');
+            }
             return $pdf->download('feedback.pdf');
         } else {
             return redirect()->back()->with('error','Error generating the Pdf, there are no drafts for this document');
         }
     }
 
+
+    private function getAnnotation($feed, $grammar) {
+        $txt ='';
+
+        switch ($grammar) {
+            case 'reflective':
+                $inlineClass="";
+                $inlineText ="";
+
+                foreach($feed->final as $ref) {
+                    $inlineText = $this->fabricateInlineText($ref);
+                    if (count($ref->css) > 0) {
+                        foreach ($ref->css as $style) {
+                            if(in_array($style, $this->checks->reflective->icons)) {
+                                $txt .= "<span class=\"std".$style." ".$style ."\"></span>";
+                            }
+                            $inlineClass = ($style==="link2me") ? "link2me" : "";
+                        }
+                    }
+                    $txt .= "<span class=\"".$inlineClass."\">".$inlineText."</span>";
+                }
+                break;
+            case 'analytical':
+                $spanClass ='';
+                foreach($feed->final as $ann) {
+                    $spanClass = $this->fabricateInlineClass($ann);
+                    if (count($ann->css) > 0) {
+                        foreach ($ann->css as $style) {
+                            $legend = isset($this->checks->analytical->analytic_xlator[$style]) ? $this->checks->analytical->analytic_xlator[$style] : '';
+                            if (in_array($style, array('contribution'))) $txt .= "<span class=\"badge badge-pill badge-analytic-green " . $style . "\">".$legend."</span>";
+                            elseif (in_array($style, array('background', 'metrics'))) $txt .= "<span class=\"" . $style . "\"></span>";
+                            else $txt .= "<span class=\"badge badge-pill badge-analytic " . $style . "\">".$legend."</span>";
+                        }
+                       // $txt .= "<span class=\".$spanClass\">" . $ann->str . "</span>";
+                    }
+                    $txt .= "<span class=\"".$spanClass."\">" . $ann->str . "</span>";
+                    //dd($txt);
+                }
+                break;
+        }
+        return $txt;
+    }
+
+
+    private function fabricateInlineText($feed) {
+        $html = '';
+
+        if($feed->str != "" && isset($feed->expression)) {
+            $html = $feed->str;
+
+            foreach($this->checks->reflective->inlineTxt as $key => $value) {
+                if($key === 'affect' &&
+                    count($feed->expression->{$key}) > 0 &&
+                    count(array_intersect($this->checks->reflective->affect_validity, $feed->css)) > 0
+                ) {
+                    foreach($feed->expression->{$key} as $word) {
+                        $html= str_replace($word->text, "<span class='std".$value." ".$value."'>$word->text</span>", $html);
+                    }
+                } else {
+                    foreach($feed->expression->{$key} as $word) {
+                        $html= str_replace($word->text, "<span class='std".$value." ".$value."'>$word->text</span>", $html);
+                    }
+                }
+            }
+
+        }
+       // dd($html);
+        return $html;
+    }
+
+
+
+    private function fabricateInlineClass($feed) {
+        $name ='';
+        $css = [];
+
+        if(count($feed->css) == 0 ) { return $name; }
+
+        foreach($feed as $key => $value) {
+            //loop to check if moves present in the array
+            if(in_array($key, $this->checks->analytical->moves_css)) {
+               if( count($feed->{$key}->css) > 0) $css[] = $key;
+            }
+        }
+
+        if(in_array('moves3', $css)) {
+            $name = "moves3";
+        } elseif(in_array('moves2', $css)) {
+            $name = "moves2";
+        } elseif(in_array('moves1', $css)) {
+            $name = "moves1";
+        } else {
+            if(count($feed->css) === 1 && in_array('metrics', $feed->css)) return '';
+            elseif(in_array('contribution', $feed->css)) $name = 'ana_bg_green';
+            else $name =  'ana_bg_yellow';
+        }
+
+
+        return $name;
+
+    }
+
+
+
 }
diff --git a/app/Http/Controllers/StringTokenizer.php b/app/Http/Controllers/StringTokenizer.php
index f53eeff..2009b01 100644
--- a/app/Http/Controllers/StringTokenizer.php
+++ b/app/Http/Controllers/StringTokenizer.php
@@ -1,27 +1,11 @@
 <?php
-/**
- * Copyright (c) 2018 original UTS CIC. Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Contributors:
- * UTS Connected Intelligence Centre
- */
-
 namespace App\Http\Controllers;
 use App\Jobs\StoreDrafts;
-use Illuminate\Http\Request;
 use EUAutomation\GraphQL\Client;
 use Illuminate\Support\Facades\Hash;
 use Html2Text\Html2Text;
 use Auth;
+use Illuminate\Http\Request;
 use App\User;
 
 class StringTokenizer extends Controller
@@ -45,8 +29,16 @@ class StringTokenizer extends Controller
                                 analytics
                         }
                 }";
-    protected $queryOneR = "query RhetoricalMoves(\$input: String!) {
-                          moves(text:\$input,grammar:\"reflective\") {
+    protected $queryOneR = "query RhetoricalMoves(\$input: String!, \$parameters:String) {
+                          moves(text:\$input,parameters:\$parameters) {
+                            analytics
+                            message
+                            timestamp
+                            querytime
+                          }
+                        }";
+    protected $queryMoves = "query RhetoricalMoves(\$input: String, \$parameters:String) {
+                          moves(text:\$input,parameters:\$parameters) {
                             analytics
                             message
                             timestamp
@@ -54,7 +46,7 @@ class StringTokenizer extends Controller
                           }
                         }";
     protected $queryOneA = "query RhetoricalMoves(\$input: String!) {
-                          moves(text:\$input,grammar:\"analytic\") {
+                          moves(text:\$input,parameters:{\"grammar\": \"analytic\"}) {
                             analytics
                             message
                             timestamp
@@ -134,6 +126,27 @@ class StringTokenizer extends Controller
                                         }
                                     }                                
                                 }";
+    protected $queryAffectExpression= "query Affect(\$input: String, \$parameters:String) {
+                                    affectExpressions(text:\$input,parameters:\$parameters) {
+                                        message
+                                        timestamp
+                                        querytime
+                                        analytics {
+                                            affect {
+                                                text
+                                                valence
+                                                arousal
+                                                dominance
+                                                startIdx
+                                                endIdx
+                                            }
+                                        }
+                                    }                         
+                                }";
+
+
+
+
     //
     public function __construct()
     {
@@ -316,25 +329,38 @@ protected function tapTokeniser($request) {
         }
         return $splitTxt;
     }
+
     //modified sentence level based on updated tokeniser query
+
     protected function rethoMoves($text, $grammar) {
         $apiResponse = new \StdClass();
         $variables = new \stdClass();
         // $variables->input = strip_tags($text);
         $variables->input = $this->cleanText($text);
+        $params = new \StdClass();
         $tags = array();
         //get athanor rethmoves
-        if($grammar == 'analytical') {
-            $this->gResponse = $this->client->response($this->queryOneA, $variables);
-        } elseif($grammar == 'reflective') {
-            $this->gResponse = $this->client->response($this->queryOneR, $variables);
+        if($grammar == 'reflective') {
+            $params->grammar = "reflective";
+            $variables->parameters = json_encode($params);
+            $this->gResponse = $this->client->response($this->queryMoves, $variables);
+        }elseif($grammar == 'analytical') {
+            $params->grammar = "analytic";
+            $variables->parameters = json_encode($params);
+            $this->gResponse = $this->client->response($this->queryMoves, $variables);
+
+            //$this->gResponse = $this->client->response($this->queryOneA, $variables);
         }
+
+        //$this->gResponse = $this->client->response($this->queryMoves, $variables);
+
         if ($this->gResponse->hasErrors()) {
             dd($this->gResponse->errors());
         } else {
             $raw_tags = $this->gResponse->moves->analytics;
             foreach($raw_tags as $tag) {$tags = $tag;}
         }
+
         return $tags;
     }
     /*
@@ -374,26 +400,7 @@ public function vocab($string) {
         }
         return $apiResponse;
     }
-    /*
-    * Used retrive expressions
-    * input: string single sentence
-     * normally only used for reflective feedback
-     * output is an array
-    */
-    public function expression($string) {
-        $apiResponse = new \StdClass();
-        $variables = new \stdClass();
-        //$variables->input = $this->cleanText($string);
-        $variables->input = $this->cleanText($string);
-        //get  metrics
-        $this->gResponse = $this->client->response($this->queryExpressions, $variables);
-        if ($this->gResponse->hasErrors()) {
-            $apiResponse = $this->gResponse->errors();
-        } else {
-            $apiResponse = $this->gResponse->expressions->analytics;
-        }
-        return $apiResponse;
-    }
+
     //quick sentence by sentence
     /*
         * Used retrive tags
@@ -429,17 +436,27 @@ public function quickTapMoves($data) {
 
     public function preProcess($data) {
         $results = array();
-
         $tokenisedText = $this->tapTokeniser($data);
+        $alreadyTapped = isset($data['currentFeedback']['tap'])? $data['currentFeedback']['tap']: array();
+        $loop = count($alreadyTapped) > 0 ? true : false;
+        $key =false;
         if(count($tokenisedText) >0 ) {
         //now go through each text and analyse
             foreach($tokenisedText as $txt) {
-                    $responseTxt = new \stdClass;
-                    $responseTxt->str= $txt->original;
+                $responseTxt = new \stdClass;
+                $responseTxt->str= $txt->original;
+                if($loop) {
+                    $key = array_search($responseTxt->str, array_column($alreadyTapped, 'str'));
+                }
+                if($key) {
+                    $responseTxt->raw_tags = $alreadyTapped[$key]['raw_tags'];
+                    $responseTxt->tags= $alreadyTapped[$key]['tags'];
+                } else {
                     $tags = $this->rethoMoves($txt->original, $data['extra']['grammar']);
                     $responseTxt->raw_tags = count($tags)>0 ? $tags : array();
                     $responseTxt->tags= implode(', ',$tags);
-                    $results[]=$responseTxt;
+                }
+                $results[]=$responseTxt;
             }
         }
 
@@ -448,9 +465,6 @@ public function preProcess($data) {
 
 
 
-
-
-
     protected function cleanText($string) {
         //$pattern = array('/<\/p>/' , '/<br\ \/>/', '/&nbsp;/');
         //$replace = array('\n', '\n', '');
diff --git a/app/Http/Traits/Analytical/Accounts.php b/app/Http/Traits/Analytical/Accounts.php
new file mode 100644
index 0000000..3d2a7ed
--- /dev/null
+++ b/app/Http/Traits/Analytical/Accounts.php
@@ -0,0 +1,230 @@
+<?php
+/**
+ * Project: AcaWriter
+ *
+ * Copyright(c)2018 original University of Technology Sydney.
+ * Licensed under the Apache License, Version2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and limitations under the License.
+ *
+ *  Contributor(s):
+ *  UTS Connected Intelligence Centre
+ */
+
+namespace App\Traits\Analytical;
+use App\Services\Analyser;
+
+trait Accounts {
+
+    /**
+     * @param $tap
+     * @param $rule --- accounting moves swap
+     * @return array
+     */
+
+    public function amoves($tap, $rule) {
+
+        $result = array();
+        $check = $rule['check'];
+        $tempo = 0;
+        $tags = $check['tags'];
+        $messages = $rule['message'];
+        if(count($tags) == 0) {
+            return $result;
+        }
+
+        foreach($tap as $key => $data) {
+            $setFeed = new \stdClass();
+            $setFeed->str = $data->str;
+            $setFeed->message = array();
+            $setFeed->css = array();
+
+            $temp_tap_raw_tags =array();
+
+
+            $filtered = array();
+            foreach($data->raw_tags as $raw) {
+                if($raw == 'nostat') {
+                    array_push($temp_tap_raw_tags, 'contrast');
+                } else {
+                    array_push($temp_tap_raw_tags, $raw);
+                }
+            }
+
+            $filtered = array_unique($temp_tap_raw_tags);
+
+            foreach($tags as $tag) {
+
+                if(count(preg_grep("[^".$tag."]", $filtered)) > 0) {
+                    foreach($messages as $msg) {
+                        if(isset($msg[$tag])) {
+                            $setFeed->message[$tag] = $msg[$tag];
+                            if(!in_array($tag,$setFeed->css)) {
+                                array_push($setFeed->css, $tag);
+                            }
+                        }
+                    }
+                }
+            }
+
+            $result[] = $setFeed;
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param $tap
+     * @param $rule -- used for accounting rules
+     * @return array
+     */
+
+    public function missingSwapTags($tap, $rule) {
+        $result = array();
+        $check = $rule['check'];
+        $tempo = 0;
+        $tags = $check['tags'];
+        $messages = $rule['message'];
+        $conditions = $check['conditions'];
+        if(count($tags) == 0) {
+            return $result;
+        }
+        $monitor = array();
+        $issues = array();
+
+        if($rule["tabEval"] === 'dynamic') {
+
+            $temp = array();
+            $temp_temp =array();
+            foreach ($tap as $key => $data) {
+                $temp_temp = array_merge($temp_temp, $data->raw_tags);
+            }
+
+            //print_r($temp_temp);
+
+            foreach($temp_temp as $raw) {
+                if($raw == 'nostat' || $raw == 'emph') {
+                    if ($raw == 'nostat') {
+                        array_push($temp, 'contrast');
+                    }
+                    if ($raw == 'emph') {
+                        array_push($temp, 'attitude');
+                    }
+                } else {
+                    array_push($temp, $raw);
+                }
+            }
+
+            $monitor = array_unique($temp);
+            //print_r($monitor);
+
+            foreach ($tags as  $d) {
+                if (!in_array($d, $monitor)) {
+                    foreach ($messages as $msg) {
+                        if (isset($msg[$d])) array_push($issues, $msg[$d]);
+                    }
+                }
+            }
+
+            //check for any conditional positive feedback - true iff all the tags are added
+            if(count($conditions) > 0 && count($issues) == 0) {
+                //will be positive in case of accounts
+                $cond_value= $conditions[0];
+                foreach ($messages as $msg) {
+                    if (isset($msg[$cond_value])) array_push($issues, $msg[$cond_value]);
+                }
+            }
+
+        } else {
+            foreach($messages as $key => $msg) {
+                array_push($issues, $msg);
+            }
+        }
+
+        array_push($result, $issues);
+        //print_r($result);
+        return $result;
+    }
+
+    /**
+     * will positive feedback per existing tag
+     * @param $tap
+     * @param $rule -- used for accounting positive feedback
+     * @return array
+     */
+
+    public function positiveFeed($tap, $rule) {
+        $result = array();
+        $check = $rule['check'];
+        $tempo = 0;
+        $tags = $check['tags'];
+        $messages = $rule['message'];
+        $conditions = $check['conditions'];
+        if(count($tags) == 0) {
+            return $result;
+        }
+        $monitor = array();
+        $issues = array();
+
+        if($rule["tabEval"] === 'dynamic') {
+
+            $temp = array();
+            $temp_temp =array();
+            foreach ($tap as $key => $data) {
+                $temp_temp = array_merge($temp_temp, $data->raw_tags);
+            }
+
+            //print_r($temp_temp);
+
+            foreach($temp_temp as $raw) {
+                if($raw == 'nostat' || $raw == 'emph') {
+                    if ($raw == 'nostat') {
+                        array_push($temp, 'contrast');
+                    }
+                    if ($raw == 'emph') {
+                        array_push($temp, 'attitude');
+                    }
+                } else {
+                    array_push($temp, $raw);
+                }
+            }
+
+            $monitor = array_unique($temp);
+            //print_r($monitor);
+            $aggregate_tags = array();
+
+            foreach ($tags as  $d) {
+                if (in_array($d, $monitor)) {
+                    foreach ($messages as $msg) {
+                        if (isset($msg[$d])) array_push($aggregate_tags, $msg[$d]);
+                    }
+                }
+            }
+            if(count($aggregate_tags) >0) {
+                $issues[] = "<div class=\"alert alert-info small\"><i class=\"fa fa fa-thumbs-up text-success\"></i> Good job! AcaWriter spotted these key moves: " . implode(',', $aggregate_tags) . "</div>";
+            }
+        } else {
+            foreach($messages as $key => $msg) {
+                array_push($issues, $msg);
+            }
+        }
+
+        array_push($result, $issues);
+        //print_r($result);
+        return $result;
+    }
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/app/Http/Traits/Analytical/Cars.php b/app/Http/Traits/Analytical/Cars.php
new file mode 100644
index 0000000..e5118d4
--- /dev/null
+++ b/app/Http/Traits/Analytical/Cars.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Project: AcaWriter
+ *
+ * Copyright(c)2018 original University of Technology Sydney.
+ * Licensed under the Apache License, Version2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and limitations under the License.
+ *
+ *  Contributor(s):
+ *  UTS Connected Intelligence Centre
+ */
+
+namespace App\Traits\Analytical;
+use App\Services\Analyser;
+
+trait Cars {
+
+    /**
+     * -- crafted this to cover sophies CARS rules, all the rules guided by features
+     * @param $tap - all tags per specified calls
+     * @param $rule - fulled from selected feature
+     * @return array - returns missing tags
+     *                         moves1, move2, move3 precedence orders and messages if not followed
+     */
+
+    public function enforced($tap, $rule) {
+        $result = array();
+        $check = $rule['check'];
+        $tempo = 0;
+        $tags = $check['tags'];
+        $messages = $rule['message'];
+        if(count($tags) == 0) {
+            return $result;
+        }
+        $monitor = array();
+        $issues = array();
+
+        if($rule["tabEval"] === 'dynamic') {
+
+
+            foreach ($tap as $key => $data) {
+                $setFeed = new \stdClass();
+                $setFeed->str = $data->str;
+                $setFeed->message = array();
+                $setFeed->css = array();
+                $setFeed->interim = array();
+
+                $temp = array();
+                foreach ($tags as $it => $case) {
+                    foreach ($case as $k => $tag) {
+                        if (count(array_intersect($tag, $data->raw_tags)) > 0) {
+                            $temp[] = $k;
+                        }
+                    }
+                }
+
+                if (count($temp) > 0) {
+                    arsort($temp);
+                    $sorted = array_unique($temp);
+                    // print_r(current($sorted));
+                    array_push($monitor, current($sorted));
+                }
+            }
+
+            foreach ($monitor as $key => $d) {
+                if (isset($monitor[$key + 1])) {
+                    $pre = $monitor[$key];
+                    $next = $monitor[$key + 1];
+                    $idx = $pre.$next;
+                    if ($pre > $next) {
+                        foreach ($messages as $msg) {
+                            if (isset($msg['problem' . $idx])) array_push($issues, $msg['problem' . $idx]);
+                        }
+                    }
+                }
+            }
+
+            // print_r($issues);
+
+            //check for missing moves
+            $unique_moves = array_unique($monitor);
+            //print_r($unique_moves);
+            foreach (array(1, 2, 3) as $move) {
+                if (!in_array($move, $unique_moves)) {
+                    foreach ($messages as $msg) {
+                        if (isset($msg['missing' . $move])) array_push($issues, $msg['missing' . $move]);
+                    }
+                }
+            }
+
+
+        } else {
+            foreach($messages as $key => $msg) {
+                array_push($issues, $msg);
+            }
+        }
+
+        array_push($result, $issues);
+        //print_r($result);
+        return $result;
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Traits/Analytical/Law.php b/app/Http/Traits/Analytical/Law.php
new file mode 100644
index 0000000..182f778
--- /dev/null
+++ b/app/Http/Traits/Analytical/Law.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Project: AcaWriter
+ *
+ * Copyright(c)2018 original University of Technology Sydney.
+ * Licensed under the Apache License, Version2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and limitations under the License.
+ *
+ *  Contributor(s):
+ *  UTS Connected Intelligence Centre
+ */
+
+namespace App\Traits\Analytical;
+use App\Services\Analyser;
+
+trait Law {
+
+    /**
+     * @param $tap
+     * @param $rule -- used for shibani's law abstract rules
+     * @return array
+     */
+
+    public function missingTags($tap, $rule) {
+        $result = array();
+        $check = $rule['check'];
+        $tempo = 0;
+        $tags = $check['tags'];
+        $messages = $rule['message'];
+        if(count($tags) == 0) {
+            return $result;
+        }
+        $monitor = array();
+        $issues = array();
+
+        if($rule["tabEval"] === 'dynamic') {
+
+            $temp = array();
+            foreach ($tap as $key => $data) {
+                $temp = array_merge($temp, $data->raw_tags);
+            }
+
+            $temp = array();
+            $temp_temp =array();
+            foreach ($tap as $key => $data) {
+                $temp_temp = array_merge($temp_temp, $data->raw_tags);
+            }
+
+            /***
+             * hacky stuff that violates the flow of rules - for Shibani....
+             * if contrast and question present don't add error
+             * else if neither of them present show  error
+             * solution replace all contrast tags with question and check for question(nostat)
+             * if present don't error else error!!!!
+             ***/
+
+            foreach($temp_temp as $v) {
+                if($v=='contrast') { array_push($temp, 'nostat');}
+                else { array_push($temp, $v); }
+            }
+
+            $monitor = array_unique($temp);
+
+            foreach ($tags as  $d) {
+                if (!in_array($d, $monitor)) {
+                    foreach ($messages as $msg) {
+                        if (isset($msg[$d])) array_push($issues, $msg[$d]);
+                    }
+                }
+            }
+
+
+        } else {
+            foreach($messages as $key => $msg) {
+                array_push($issues, $msg);
+            }
+        }
+
+        array_push($result, $issues);
+        //print_r($result);
+        return $result;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Traits/Profiler.php b/app/Http/Traits/Profiler.php
new file mode 100644
index 0000000..0e84a9b
--- /dev/null
+++ b/app/Http/Traits/Profiler.php
@@ -0,0 +1,238 @@
+<?php
+/**
+ * Project: AcaWriter
+ *
+ * Copyright(c)2018 original University of Technology Sydney.
+ * Licensed under the Apache License, Version2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and limitations under the License.
+ *
+ *  Contributor(s):
+ *  UTS Connected Intelligence Centre
+ */
+
+namespace App\Traits;
+use App\Services\Analyser;
+
+trait Profiler {
+
+    public function moves($tap, $rule) {
+
+        $result = array();
+        $check = $rule['check'];
+        $tempo = 0;
+        $tags = $check['tags'];
+        $messages = $rule['message'];
+        if(count($tags) == 0) {
+            return $result;
+        }
+
+        foreach($tap as $key => $data) {
+            $setFeed = new \stdClass();
+            $setFeed->str = $data->str;
+            $setFeed->message = array();
+            $setFeed->css = array();
+
+            foreach($tags as $tag) {
+                if(count(preg_grep("[^".$tag."]", $data->raw_tags)) > 0) {
+                    foreach($messages as $msg) {
+                        if(isset($msg[$tag])) {
+                            $setFeed->message[$tag] = $msg[$tag];
+                            array_push($setFeed->css,$tag);
+                        }
+                    }
+                }
+            }
+            $result[] = $setFeed;
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param $tap
+     * @param $rule --- added to display static msg into the tab's
+     * @return array
+     */
+
+    public function staticFeed($tap, $rule) {
+        $result = array();
+        $check = $rule['check'];
+        $tempo = 0;
+        $tags = $check['tags'];
+        $messages = $rule['message'];
+
+        $monitor = array();
+        $issues = array();
+
+        if($rule["tabEval"] === 'dynamic') {
+
+        } else {
+            foreach($messages as $key => $msg) {
+                array_push($issues, $msg['txt']);
+            }
+        }
+        array_push($result, $issues);
+        return $result;
+    }
+
+    public function background($tap, $rule) {
+        $result = array();
+        $check = $rule['check'];
+        $tempo = 0;
+
+        foreach($tap as $key => $data) {
+            $setFeed = new \stdClass();
+            $setFeed->str = $data->str;
+            $setFeed->message = array();
+            $setFeed->css = array();
+            if ($key < $check['paragraph'] && count($data->raw_tags) > 0) {
+                if (in_array($check['paragraph'], $data->raw_tags)) {
+                    $tempo++;
+                }
+            }
+        }
+
+        if ($tempo == 0 && $key == $this->para - 1) {
+            $setFeed->message['background'] = $rule['message'];
+            $setFeed->css[] = 'background';
+            $result[] = $setFeed;
+        }
+
+        return $result;
+    }
+
+    public function metrics($tap, $rule) {
+        $analyser = new Analyser();
+        $result = array();
+        $check = $rule['check'];
+
+        foreach($tap as $key => $data) {
+            $tempStore = new \stdClass();
+            $tempStore->str = $data->str;
+            $tempStore->message = array();
+            $tempStore->css = array();
+            $returnData = $analyser->metrics($data->str);
+            if(isset($returnData->sentWordCounts)) {
+                //sentWordCounts is always an array e.g. [5,6] if two sentences sent here we send only one at a time though
+                if($returnData->sentWordCounts[0] > $check['sentenceWordCount']) {
+                    //$tempStore->message = $rule['message'];
+                    foreach($rule['message'] as $msg) {
+                        if(isset($msg['metrics'])) {
+                            $tempStore->message['metrics'] = $msg['metrics'];
+                            array_push($tempStore->css, 'metrics');
+                        }
+                    }
+                }
+            }
+            $result[] = $tempStore;
+        }
+        return $result;
+
+    }
+
+    /**
+        * function works on the complete text at once, so input is not tokenised
+        * so str = append all tokenised tap outputs into one
+    */
+
+    public function vocab($tap, $rule) {
+        $analyser = new Analyser();
+        $result = array();
+        $check = $rule['check'];
+        $termCount = 0;
+        $words = $check['words'];
+        $completeText = "";
+
+        foreach($tap as $key => $data) {
+            $completeText .= $data->str;
+        }
+        $tempStore = new \stdClass();
+        $tempStore->str = $completeText;
+        $tempStore->message = array();
+        $tempStore->css =array();
+
+        $returnData = $analyser->vocab($tempStore->str);
+        if(isset($returnData->terms)) {
+            $collection = collect($returnData->terms);
+
+            foreach($check['words'] as $word) {
+                $filtered= $collection->where('term', $word);
+                if(count($filtered->all()) == 0) $termCount++;
+            }
+
+            if($termCount > 0 ) {
+                foreach($rule['message'] as $msg) {
+                    if(isset($msg['metrics'])) {
+                        $tempStore->message['vocab'] = $msg['vocab'];
+                        $tempStore->css[] = 'vocab';
+                    }
+                }
+                $result[] = $tempStore;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Used retrieve expressions
+     * input: string single sentence
+     * normally only used for reflective feedback
+     * output is an array
+    */
+
+    protected function expression($tap, $rule) {
+
+        $analyser = new Analyser();
+        $result = array();
+        $check = $rule['check'];
+        $termCount = 0;
+        $all = $check['all'];
+        //fetch affect values
+        $affectValues = $check["affectVal"]? $check["affectVal"] :'';
+
+        if(count($all) == 0) {
+            return $result;
+        }
+
+        foreach($tap as $key => $data) {
+            $tempStore = new \stdClass();
+            $tempStore->str = $data->str;
+            $tempStore->message = array();
+            $tempStore->affect=array();
+            $tempStore->epistemic=array();
+            $tempStore->modal=array();
+            $tempStore->css = array();
+
+            $returnData = $analyser->expression($data->str, $affectValues);
+            //$returnData is an array but since we are analysing tokenised strings we can safely assume array[0]
+            $sanitizedResult = $returnData[0];
+            //$tempStore->raw = $sanitizedResult;
+            foreach($all as $exp) {
+
+                if (isset($sanitizedResult->{$exp}) && count($sanitizedResult->{$exp}) > 0) {
+                    $tempStore->{$exp} = $sanitizedResult->{$exp};
+                    foreach($rule['message'] as $msg) {
+                        if(isset($msg[$exp])) {
+                            $tempStore->message[$exp] = $msg[$exp];
+                            array_push($tempStore->css, $exp);
+                        }
+                    }
+                }
+            }
+
+            $result[] = $tempStore;
+        }
+
+        return $result;
+    }
+}
\ No newline at end of file
diff --git a/app/Jobs/StoreDraftWithoutFeedback.php b/app/Jobs/StoreDraftWithoutFeedback.php
index 11e7605..8917c3e 100644
--- a/app/Jobs/StoreDraftWithoutFeedback.php
+++ b/app/Jobs/StoreDraftWithoutFeedback.php
@@ -1,19 +1,4 @@
 <?php
-/**
- * Copyright (c) 2018 original UTS CIC. Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Contributors:
- * UTS Connected Intelligence Centre
- */
 
 namespace App\Jobs;
 
@@ -87,7 +72,7 @@ public function handle()
         $activityLog->ref = $draftNew;
         $activityLog->jobRef = $jobRef;
 
-        print_r($activityLog);
+        //print_r($activityLog);
 
         event(new UserActivity($this->user, $activityLog));
 
diff --git a/app/Jobs/StoreDrafts.php b/app/Jobs/StoreDrafts.php
index f258f23..691a084 100644
--- a/app/Jobs/StoreDrafts.php
+++ b/app/Jobs/StoreDrafts.php
@@ -1,19 +1,4 @@
 <?php
-/**
- * Copyright (c) 2018 original UTS CIC. Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Contributors:
- * UTS Connected Intelligence Centre
- */
 
 namespace App\Jobs;
 
diff --git a/composer.json b/composer.json
index 4c708df..33139be 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,11 @@
     "require": {
         "php": ">=5.6.4",
         "aws/aws-sdk-php-laravel": "~3.0",
+        "barryvdh/laravel-dompdf": "^0.8.2",
+        "doctrine/dbal": "^2.6",
         "euautomation/graphql-client": "^0.2.0",
+        "barryvdh/laravel-dompdf": "^0.8.2",
+        "doctrine/dbal": "^2.6",
         "guzzlehttp/guzzle": "~6.0",
         "laravel/framework": "5.4.*",
         "laravel/tinker": "~1.0",
@@ -53,6 +57,7 @@
     "config": {
         "preferred-install": "dist",
         "sort-packages": true,
-        "optimize-autoloader": true
+        "optimize-autoloader": true,
+        "secure-http":false
     }
 }
diff --git a/database/seeds/FeatureReflectiveUpdateSeeder.php b/database/seeds/FeatureReflectiveUpdateSeeder.php
index bfe8ff1..411df3d 100644
--- a/database/seeds/FeatureReflectiveUpdateSeeder.php
+++ b/database/seeds/FeatureReflectiveUpdateSeeder.php
@@ -21,28 +21,17 @@ public function run()
       \"check\": {
         \"all\": [
           \"epistemic\",
-          \"modal\"
-        ]
+          \"modal\",
+          \"affect\"
+        ],
+        \"affectVal\": {\"arousal\": 4.95, \"valence\":0, \"dominance\":0}
       },
       \"message\": [
         {\"epistemic\" : \"<u>Expressions indicating belief, learning, or knowledge.</u>\"},
-        {\"modal\" : \"<span class=\\\"modall\\\">Expressions indicating self critique<\/span>\"}
+        {\"modal\" : \"<span class=\\\"modall\\\">Expressions indicating self critique<\/span>\"},
+        {\"affect\" :\"<span class=\\\"affect\\\">Words associated with strong feelings<\/span>\"}
       ],
-      \"css\": [\"epistemic\",\"affect\",\"modall\"]
-    },
-    {
-      \"name\": \"vocab\",
-      \"check\": {
-        \"words\": [
-          \"server\",
-          \"study\",
-          \"force\"
-        ]
-      },
-      \"message\": [
-        {\"vocab\" :\"One or more keywords missing\"}
-      ],
-      \"css\": [\"vocab\"]
+      \"css\": [\"epistemic\",\"modall\"]
     },
     {
       \"name\": \"metrics\",
@@ -54,6 +43,21 @@ public function run()
       ],
       \"css\": [\"metrics\"]
     },
+    {
+      \"name\": \"filterWords\",
+      \"check\": {
+        \"list\": [
+            {
+            \"words\" : 
+                [\"preceptor\",\"supervisor\", \"hospital\", \"Community\", \"Pharmacy\", \"Placement\", \"site\", \"pharmacy\", \"pharmacist\",\"mentor\"], 
+            \"tags\" : 
+                [\"affect\"]
+            }
+        ]
+      },
+      \"message\": [],
+      \"css\": []
+    },
     {
       \"name\": \"moves\",
       \"check\": {
diff --git a/database/seeds/FeaturesAnalyticalAccounting.php b/database/seeds/FeaturesAnalyticalAccounting.php
new file mode 100644
index 0000000..a8e074c
--- /dev/null
+++ b/database/seeds/FeaturesAnalyticalAccounting.php
@@ -0,0 +1,122 @@
+<?php
+
+use Illuminate\Database\Seeder;
+use App\Feature;
+
+class FeaturesAnalyticalAccounting extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * Insert analytical accounting rule
+     *
+     * @return void
+     */
+    public function run()
+    {
+        //
+        $feature_a = new Feature();
+        $feature_a->name = "Analytical Accounting";
+        $feature_a->grammar="Analytical";
+        $feature_a->rules=json_encode("{
+  \"rules\": [
+    {
+       \"name\": \"moves\",
+      \"check\": {
+        \"tags\": [
+          \"attitude\",
+          \"emph\",
+          \"contribution\",
+          \"novstat\",
+          \"contrast\",
+          \"tempstat\",
+          \"surprise\",
+          \"nostat\",
+          \"grow\"
+        ]
+      },
+      \"message\": [
+        {\"contribution\" : \"<span class=\\\"badge badge-pill badge-analytic-green\\\">S<\/span> Summarises or signals the authors goals\"},
+        {\"attitude\" : \"<span class=\\\"badge badge-pill badge-analytic\\\">P<\/span> Perspective or stance\"},
+        {\"emph\" : \"<span class=\\\"badge badge-pill badge-analytic\\\">E<\/span> Emphasis to highlight key ideas\"},
+        {\"novstat\" : \"<span class=\\\"badge badge-pill badge-analytic\\\">N<\/span> Novel improvements in ideas\"},
+        {\"contrast\" : \"<span class=\\\"badge badge-pill badge-analytic\\\">C</span> Contrasting idea, tension or critical insight\"},
+        {\"tempstat\": \"<span class=\\\"badge badge-pill badge-analytic\\\">B</span> Background information and previous work\"},
+        {\"nostat\": \"<span class=\\\"badge badge-pill badge-analytic\\\">Q</span> Question or gap in previous knowledge\"}
+      ],
+      \"css\": [\"P\",\"E\", \"S\", \"N\", \"C\", \"B\"],
+      \"custom\" : \"<span class=\\\"small\\\">The analytical report highlights salient rhetorical moves AcaWriter identified in your essay for reflection. For more specific feedback, go to the Feedback tab.<\/span><h5>Rhetorical Moves<\/h5>\",
+      \"tab\": 1,
+      \"tabName\": \"Analytical Feedback\"`
+    },
+    {
+      \"name\": \"alerts\",
+      \"method\": \"staticFeed\",
+      \"check\": {
+        \"tags\": [
+        ],
+        \"conditions\" : [
+        ]
+      },
+      \"message\": [
+        {\"txt\" : \"<div class=\\\"alert alert-success\\\"><small>The rhetorical moves highlighted by AcaWriter are used in good academic writing but use them with caution according to the context. Remember, AcaWriter does not really understand your writing, the way people do. You may have written beautifully crafted nonsense - that's for you to decide! Moreover, writing is complex, and AcaWriter will get it wrong sometimes. If you think it got it wrong, that's fine - now you're thinking about more than spelling, grammar, and plagiarism.<\/small> <\/div>\"}
+      ],
+      \"css\": [\"msg1\"],
+      \"custom\" : \"more feedback\",
+      \"tab\" :2,
+      \"tabName\": \"Feedback\",
+      \"tabEval\": \"static\"
+    },
+    {
+      \"name\": \"customised\",
+      \"method\": \"missingSwapTags\",
+      \"check\": {
+        \"tags\": [
+          \"contribution\",
+          \"tempstat\",
+          \"contrast\",
+          \"attitude\",
+          \"novstat\"
+        ],
+        \"conditions\" : [
+            {\"emph\": \"attitude\"},
+            {\"nostat\" : \"contrast\"}
+        ]
+      },
+      \"message\": [
+        {\"contribution\": \"<div class=\\\"alert alert-info\\\"><i class=\\\"fa fa-exclamation-circle\\\"></i> It looks like you are missing a Summary move that highlights the purpose (thesis) statement of your essay and your essay plan. Try including linguistic cues to make this move clearer in your writing. Examples: This essay talks about.., In this essay, I analyse…, This essay consists of three parts… The first part talks about…, In conclusion,... <\/div>\"},
+        {\"tempstat\": \"<div class=\\\"alert alert-info\\\"><i class=\\\"fa fa-exclamation-circle\\\"></i> It looks like you are missing a Background move in your text, which highlights background information and previous literature on the topic. Try including linguistic cues to make this move clearer in your writing. Examples: The past decade has seen ...., Recent studies indicate ... ,It is generally accepted that..., the concept has previously been thought to be... <\/div>\"},
+        {\"contrast\": \"<div class=\\\"alert alert-info\\\"><i class=\\\"fa fa-exclamation-circle\\\"></i> It looks like you are missing Contrast move, which highlights the critical insights in your essay. Try including linguistic cues to make this move clearer in your writing. Examples: However, the issue seems to be..., the study fails to consider, little research has been done..., ...raises various questions... <\/div>\"},
+        {\"attitude\": \"<div class=\\\"alert alert-info\\\"><i class=\\\"fa fa-exclamation-circle\\\"></i> If there is a key idea you did like to position in your essay try including linguistic cues to make this move clearer in your writing. Examples: It is important to note that ...., It makes a proper understanding important...\"}
+        {\"novstat\": \"<div class=\\\"alert alert-info\\\"><i class=\\\"fa fa-exclamation-circle\\\"></i> If there is a key idea you did like to novelty in your essay try including this move clearer in your writing. Examples: It is important to note that ...., It makes a proper understanding important...\"}
+      ],
+      \"css\": [\"mtags\"],
+      \"custom\" : \"Feedback\",
+      \"tab\" :2,
+      \"tabName\": \"Feedback\",
+      \"tabEval\": \"dynamic\"
+    },
+    {
+      \"name\": \"faq\",
+      \"method\": \"staticFeed\",
+      \"check\": {
+        \"tags\": [
+        ],
+        \"conditions\" : [
+        ]
+      },
+      \"message\": [
+         {\"txt\":\"A list of sample sentences with rhetorical moves, mapped to your essay assessment rubric is provided below:\"},
+         {\"txt\" : \"<table class=\\\"table table-bordered\\\"><thead><tr class=\\\"table-secondary\\\"><th scope=\\\"col\\\">Sample Sentence<\/th><th scope=\\\"col\\\">Essay Assessment Rubric Element<\/th><th scope=\\\"col\\\">AcaWriter Move<\/th><\/tr><\/thead><tbody><tr><td scope=\\\"row\\\">The concept of good faith <strong>has previously been thought<\/strong> to be a work in progress in Australia.<\/td><td>Engagement with the law and scholarly literature<\/td><td>Background<\/td><\/tr><tr><td scope=\\\"row\\\"><strong>This article will trace<\/strong> the origins of good faith and its development in the common law. <strong>This essay contains three parts. The first part will talk about<\/strong> the origins of good faith.<\/td><td>Statement of thesis, Essay plan<\/td><td>Summary<\/td><\/tr><tr><td scope=\\\"row\\\"><strong>However<\/strong>, where the obligations are found in statute and they conflict with contractual obligations, <strong>it is important to note that<\/strong> the former must prevail.<\/td><td>Identification of relevant issues, Critical analysis and original insight<\/td><td>Contrast,Emphasis<\/td><\/tr><\/tbody><\/table>\"}
+       ],
+      \"css\": [\"msg1\", \"msg2\"],
+      \"custom\" : \"more feedback\",
+      \"tab\" :3,
+      \"tabName\": \"Examples\",
+      \"tabEval\": \"static\"
+    }
+  ]
+}");
+        $feature_a->save();
+    }
+}
diff --git a/database/seeds/FeaturesAnalyticalAccountingUpdate.php b/database/seeds/FeaturesAnalyticalAccountingUpdate.php
new file mode 100644
index 0000000..66d83a3
--- /dev/null
+++ b/database/seeds/FeaturesAnalyticalAccountingUpdate.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Project: AcaWriter
+ * Copyright (c) 2018 original University of Technology Sydney. Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Contributor(s):
+ * Developer UTS Connected Intelligence Centre
+ *
+ */
+
+use Illuminate\Database\Seeder;
+use App\Feature;
+
+class FeaturesAnalyticalAccountingUpdate extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        //
+        //
+        $feature = Feature::find(7);
+        $feature->rules= json_encode("{
+  \"rules\": [
+    {
+       \"name\": \"amoves\",
+      \"check\": {
+        \"tags\": [
+          \"attitude\",
+          \"emph\",
+          \"contribution\",
+          \"novstat\",
+          \"contrast\",
+          \"tempstat\",
+          \"nostat\"
+        ]
+      },
+      \"message\": [
+        {\"contribution\" : \"<span class=\\\"badge badge-pill badge-analytic-green\\\">S<\/span> Summarises or signals the authors goals\"},
+        {\"attitude\" : \"<span class=\\\"badge badge-pill badge-analytic\\\">P<\/span> Perspective or stance\"},
+        {\"novstat\" : \"<span class=\\\"badge badge-pill badge-analytic\\\">N<\/span> Novel improvements in ideas\"},
+        {\"emph\" : \"<span class=\\\"badge badge-pill badge-analytic\\\">E<\/span>Emphasis of a significant or an important idea \"},
+        {\"contrast\" : \"<span class=\\\"badge badge-pill badge-analytic\\\">C</span> Contrasting idea, tension or critical insight\"},
+        {\"tempstat\": \"<span class=\\\"badge badge-pill badge-analytic\\\">B</span> Background information and previous work\"}
+      ],
+      \"css\": [\"P\", \"S\", \"N\", \"C\", \"B\"],
+      \"custom\" : \"<span class=\\\"small\\\">The analytical report highlights salient rhetorical moves AcaWriter identified in your essay for reflection. For more specific feedback, go to the Feedback tab.<\/span><h5>Rhetorical Moves<\/h5>\",
+      \"tab\": 1,
+      \"tabName\": \"Analytical Feedback\"
+    },
+    {
+      \"name\": \"alerts\",
+      \"method\": \"staticFeed\",
+      \"check\": {
+        \"tags\": [
+        ],
+        \"conditions\" : [
+        ]
+      },
+      \"message\": [
+        {\"txt\" : \"<div class=\\\"alert alert-success\\\"><small>The rhetorical moves highlighted by AcaWriter are used in good academic writing but use them with caution according to the context. Remember, AcaWriter does not really understand your writing, the way people do. You may have written beautifully crafted nonsense - that's for you to decide! Moreover, writing is complex, and AcaWriter will get it wrong sometimes. If you think it got it wrong, that's fine - now you're thinking about more than spelling, grammar, and plagiarism.<\/small> <\/div>\"}
+      ],
+      \"css\": [\"msg1\"],
+      \"custom\" : \"more feedback\",
+      \"tab\" :2,
+      \"tabName\": \"Feedback\",
+      \"tabEval\": \"static\"
+    },
+    {
+      \"name\": \"customised\",
+      \"method\": \"positiveFeed\",
+      \"check\": {
+        \"tags\": [
+          \"contribution\",
+          \"tempstat\",
+          \"attitude\",
+          \"contrast\"
+        ],
+        \"conditions\" : [
+        ]
+      },
+      \"message\":[
+        {\"contribution\":\"Summary\"},
+        {\"tempstat\":\"Background\"},
+        {\"attitude\":\"Perspective\"},
+        {\"contrast\":\"Contrast\"}
+      ],
+      \"css\": [\"mtags\"],
+      \"custom\" : \"Feedback\",
+      \"tab\" :2,
+      \"tabName\": \"Feedback\",
+      \"tabEval\": \"dynamic\"
+    },
+    {
+      \"name\": \"customised\",
+      \"method\": \"missingSwapTags\",
+      \"check\": {
+        \"tags\": [
+          \"contribution\",
+          \"tempstat\",
+          \"attitude\",
+          \"contrast\"
+        ],
+        \"conditions\" : [
+        ]
+      },
+      \"message\": [
+        {\"contribution\": \"<div class=\\\"alert alert-info small\\\"><i class=\\\"fa fa-exclamation-triangle text-danger\\\"></i> It looks like you are missing a Summary move that defines the goal or summary of your report and its sections. Try including linguistic cues to make this move clearer in your writing like: This report defines… , the report first examines.. then.., this section explains... Note that you should use past tense in the executive summary section where you explain your results. <\/div>\"},
+        {\"tempstat\": \"<div class=\\\"alert alert-info small\\\"><i class=\\\"fa fa-exclamation-triangle text-danger\\\"></i>  It looks like you are missing a Background move in your text, which highlights previous work on the topic. Some linguistic cues that exemplify background are: Previous market analysis demonstrate that…, …is widely recognised as …  , It is generally accepted that...Also, make sure that you provide relevant contextual information on the organisation.<\/div>\"},
+        {\"attitude\": \"<div class=\\\"alert alert-info small\\\"><i class=\\\"fa fa-exclamation-triangle text-danger\\\"></i> It looks like you are missing Perspective and Emphasis moves, which highlight your attitude about an idea in text. Try including linguistic cues to make this move clearer in your writing. Examples: The key factor is that…, They highlight the focus on .., …is a critical aspect of….., Academic theory holds that… <\/div>\"},
+        {\"contrast\": \"<div class=\\\"alert alert-info small\\\"><i class=\\\"fa fa fa-exclamation-triangle text-danger\\\"></i> It looks like you are missing a Contrast move which highlights disagreement, issues, or alternatives. Try including linguistic cues to make this move clearer in your writing like: Although it is the case… , One challenge is..., However, this problem.. <\/div>\"}
+      ],
+      \"css\": [\"mtags\"],
+      \"custom\" : \"Feedback\",
+      \"tab\" :2,
+      \"tabName\": \"Feedback\",
+      \"tabEval\": \"dynamic\"
+    },
+    {
+      \"name\": \"faq\",
+      \"method\": \"staticFeed\",
+      \"check\": {
+        \"tags\": [
+        ],
+        \"conditions\" : [
+        ]
+      },
+      \"message\": [
+         {\"txt\":\"Here are certain rhetorical moves you can look for in your report and example sentences for your reference.<br \/><br \/><u>Organisational analysis<\/u><br \/> Where does your report provide contextual information about the organisation’s objectives, strategy, structure and activities?<br \/><u>Defining performance<\/u><br \/>Where does your report provide your perspective <span class=\\\"badge badge-pill badge-analytic\\\">P<\/span> about how to define performance or success for the organisation? Where does your report provide emphasis <span class=\\\"badge badge-pill badge-analytic\\\">E<\/span> to highlight the most important aspects of performance for the organisation?<br \/><u>Justification of your definition of performance<\/u><br \/>Where does your report provide convincing, persuasive justifications for your definition of performance by proposing novel <span class=\\\"badge badge-pill badge-analytic\\\">N<\/span> or critical insights, contrasting ideas or tension <span class=\\\"badge badge-pill badge-analytic\\\">C<\/span>? Where does your report justify your definition of performance with reference to prior work or background <span class=\\\"badge badge-pill badge-analytic\\\">B<\/span>?<br \/><u>Written communication<\/u><br \/>Where in your report do you use appropriate summary statements <span class=\\\"badge badge-pill badge-analytic-green\\\">S<\/span> to signal the content, sequence and goals of the report?<br \/>\"},
+         {\"txt\" : \"<table class=\\\"table table-bordered\\\"><thead><tr class=\\\"table-secondary\\\"><th scope=\\\"col\\\">Acawriter Move<\/th><th scope=\\\"col\\\">Sample Sentences<\/th><\/tr><\/thead><tbody><tr><td scope=\\\"row\\\">Summary<\/td><td><span class=\\\"badge badge-pill badge-analytic-green\\\">S<\/span> This report defines performance for Nike Inc as a whole from the three main perspectives of economic, social and environmental performance. <br \/> <span class=\\\"badge badge-pill badge-analytic-green\\\">S<\/span> This section will explain how sustainability can result in the achievement of organisational objectives and contribute to company success. <\/td><\/tr><tr><td scope=\\\"row\\\">Perspective, Emphasis<\/td><td><span class=\\\"badge badge-pill badge-analytic\\\">P<\/span> Importantly, research has suggested a link between stronger brand perception and customer loyalty.<br \/><span class=\\\"badge badge-pill badge-analytic\\\">E<\/span> Therefore, to effectively measure performance for the Canadian Head Office of Lululemon it is essential to consider how the transformational self-improvement ethos of the company is achieved by analysing non-traditional metrics.<\/td><\/tr><tr><td scope=\\\"row\\\">Background<\/td><td><span class=\\\"badge badge-pill badge-analytic\\\">B<\/span> Previous market analysis shows that Nike is the world’s largest supplier of athletic shoes, equipment, and apparel. <br \/><span class=\\\"badge badge-pill badge-analytic\\\">B<\/span> Such an evaluation by a global organization has been observed previously.<\/td><\/tr><tr><td scope=\\\"row\\\">Contrasting ideas and Issues<\/td><td><span class=\\\"badge badge-pill badge-analytic\\\">C<\/span> These requirements maintain product quality as unethically produced garments could be of lower quality, damage its reputation and ultimately contradict the companys objective.<br \/><span class=\\\"badge badge-pill badge-analytic\\\">C<\/span> While the companys corporate mission is to maintain its market position as a leading brand for an active and mindful lifestyle, a holistic approach to defining performance is necessary given that Lululemons strength lies in its premium image<\/td><\/tr><tr><td scope=\\\"row\\\">Novelty<\/td><td><span class=\\\"badge badge-pill badge-analytic\\\">N<\/span> This closer connection with their customers allows Nike to create new ideas and convert them into products quicker while also being in touch with their demands. <br \/><span class=\\\"badge badge-pill badge-analytic\\\">N<\/span> Nike believes that through investing in employees and communities, they can inspire while also creating a new method of growth (Nike 2018c). <\/td><\/tr><\/tbody><\/table>\"}
+       ],
+      \"css\": [\"msg1\", \"msg2\"],
+      \"custom\" : \"more feedback\",
+      \"tab\" :3,
+      \"tabName\": \"Tips\",
+      \"tabEval\": \"static\"
+    }
+  ]
+}");
+
+        $feature->save();
+    }
+}
\ No newline at end of file
diff --git a/database/seeds/FeaturesAnalyticalUpdateSeeder.php b/database/seeds/FeaturesAnalyticalUpdateSeeder.php
index 3cedc27..15006b2 100644
--- a/database/seeds/FeaturesAnalyticalUpdateSeeder.php
+++ b/database/seeds/FeaturesAnalyticalUpdateSeeder.php
@@ -106,9 +106,9 @@ public function run()
         ]
       },
       \"message\": [
-        {\"problem21\" : \"<div class=\\\"alert alert-info\\\" role=\\\"alert\\\"><i class=\\\"fa fa-exclamation-circle\\\"></i> You have indicated the research gap and(or) written about your research problem-Move 2 Establishing a nice (C or Q sentences) before explaining how your research topic is relevant and important which is Move 1 (E or B sentences). It’s better to give some background information on your research topic before jumping straight into your gap and research problem. Acawriter suggests moving Move 1 Establishing the research territory (E or B sentences) before Move 2 Establishing a nice (C or Q sentences). <\/div>\"},
-        {\"problem31\" : \"<div class=\\\"alert alert-info\\\" role=\\\"alert\\\"><i class=\\\"fa fa-exclamation-circle\\\"></i> It seems you have stated how your research fills the gap and/or solves the research problem [Move 3 – Occupying the niche (S or N sentences)] before you have given background information on your research [Move 1 - Establishing the research territory (E or B sentences)]. It is more effective to state how your research fills the gap or solves the research problem at the end of your introduction, as this is an effective transition into the next section of your paper. <\/div>\"},
-        {\"problem32\" : \"<div class=\\\"alert alert-info\\\" role=\\\"alert\\\"><i class=\\\"fa fa-exclamation-circle\\\"></i> It seems you have stated how your research fills the gap and/or solves the research problem [Move 3 – Occupying the niche (S or N sentences)] before you have indicated the gap and/or explained your research problem [Move 2 Establishing a nice (C or Q sentences)]. It is more effective to indicate the gap and explain the research problem before you state your solution and aim of your study.  Acawriter suggests putting Move 3 – Occupying the niche (S or N sentences) after Move 2 Establishing a nice (C or Q sentences).<\/div>\"},
+        {\"problem21\" : \"<div class=\\\"alert alert-info\\\" role=\\\"alert\\\"><i class=\\\"fa fa-exclamation-circle\\\"></i> You have indicated the research gap or written about your research problem [Move 2 Establishing a niche (C or Q sentences)] before explaining how your research topic is relevant and important [Move 1 (E or B sentences)]. It’s better to give some background information on your research topic before jumping straight into your gap and research problem. Go back and check if Move 1 Establishing the research territory (E or B sentences) is before Move 2 Establishing a niche (C or Q sentences). <\/div>\"},
+        {\"problem31\" : \"<div class=\\\"alert alert-info\\\" role=\\\"alert\\\"><i class=\\\"fa fa-exclamation-circle\\\"></i> It seems you have stated how your research fills the gap or solves the research problem [Move 3 – Occupying the niche (S or N sentences)] before you have given background information on your research [Move 1 - Establishing the research territory (E or B sentences)]. It is more effective to state how your research fills the gap or solves the research problem at the end of your introduction, as this is an effective transition into the next section of your paper. <\/div>\"},
+        {\"problem32\" : \"<div class=\\\"alert alert-info\\\" role=\\\"alert\\\"><i class=\\\"fa fa-exclamation-circle\\\"></i> It seems you have explained how your research fills the gap or solves the research problem [Move 3 – Occupying the niche (S or N sentences)] before you have indicated the gap or explained your research problem [Move 2 Establishing a niche (C or Q sentences)]. It is more effective to indicate the gap and explain the research problem before you state your solution and aim of your study.  Go back and revise your text so that Move 3 – Occupying the niche (S or N sentences) is after Move 2 Establishing a niche (C or Q sentences).<\/div>\"},
         {\"missing1\" : \"<div class=\\\"alert alert-info\\\" role=\\\"alert\\\"><i class=\\\"fa fa-exclamation-circle\\\"></i> It looks like you are missing Move 1 – Establishing a research territory (E or B sentences). Here you should show how your research topic is relevant and important by introducing & reviewing previous research on your topic. For example, recent research indicates that the effects of climate change have…. (for more examples head to the resources tab)<\/div>\"},
         {\"missing2\" : \"<div class=\\\"alert alert-info\\\" role=\\\"alert\\\"><i class=\\\"fa fa-exclamation-circle\\\"></i> It looks like you are missing Move 2 – Establishing a niche (C or Q sentences). Here you should indicate the gap and state the research problem, by explaining how previous research is incomplete or that there are aspects of the research topic that still needs investigating. This can be done by using sentences like these: However, these studies have failed to recognise that…., Limited research exists on……, Despite earlier studies the effects of x remains unclear. (for more examples head to the resources tab) <\/div>\"},
         {\"missing3\" : \"<div class=\\\"alert alert-info\\\" role=\\\"alert\\\"><i class=\\\"fa fa-exclamation-circle\\\"></i> It looks like you are missing Move 3 – Occupying the niche (S or N sentences). Here you should state how your research fills the gap or solves the research problem mentioned in Move 2. You can do this by stating the aim and purpose of your research. For example, this goal of this study, this research shows that.., the purpose of this investigation….(for more examples head to the resources tab)<\/div>\"}
@@ -129,7 +129,7 @@ public function run()
         ]
       },
       \"message\": [
-        {\"txt\" : \"<div class=\\\"alert alert-dark\\\" role=\\\"alert\\\">An effective way to introduce your research is by using the Creating a Research Space (C.A.R.S) framework developed by linguist John Swales (1990). Swales (1990) analysed journal articles from a variety of disciplines and found that researchers follow a particular organisational pattern of moves when writing the introduction. The <strong>CARS<\/strong> moves are as follows:<br \/><br \/><i class=\\\"fa fa-angle-double-right\\\"><\/i><strong>Establish a research territory<\/strong> to show how the research area is important and worth investigating, by introducing and reviewing previous research <br \/><i class=\\\"fa fa-angle-double-right\\\"><\/i><strong>Establish a niche<\/strong> by indicating a gap in previous research or raising questions about it<br \/><i class=\\\"fa fa-angle-double-right\\\"><\/i><strong>Occupy the niche <\/strong> by stating how one’s own research seeks to close\/fill the gap. <br \/><br \/>Following CARS will help set the scene of your research and will make it easier for others to understand your research.<br \/>For more information on how to apply CARS in your research writing please <a href=\\\"http:\/\/utscic.edu.au\/tools\/cars\\\">click<\/a> here.<\/div>\"}
+        {\"txt\" : \"<div class=\\\"alert alert-dark\\\" role=\\\"alert\\\">An effective way to introduce your research is by using the Creating a Research Space (C.A.R.S) framework developed by linguist John Swales (1990). Swales (1990) analysed journal articles from a variety of disciplines and found that researchers follow a particular organisational pattern of moves when writing the introduction. The <strong>CARS<\/strong> moves are as follows:<br \/><br \/><i class=\\\"fa fa-angle-double-right\\\"><\/i><strong>Establish a research territory<\/strong> to show how the research area is important and worth investigating, by introducing and reviewing previous research <br \/><i class=\\\"fa fa-angle-double-right\\\"><\/i><strong>Establish a niche<\/strong> by indicating a gap in previous research or raising questions about it<br \/><i class=\\\"fa fa-angle-double-right\\\"><\/i><strong>Occupy the niche <\/strong> by stating how one’s own research seeks to close\/fill the gap. <br \/><br \/>Following CARS will help set the scene of your research and will make it easier for others to understand your research.<br \/>For more information on how to apply CARS in your research writing please <a target=\\\"_blank\\\" href=\\\"http:\/\/heta.io\/resources\/wawa-improving-research-abstracts-intros\/?target=resources\\\">click<\/a> here.<\/div>\"}
        ],
       \"css\": [\"msg1\", \"msg2\"],
       \"custom\" : \"more feedback\",
diff --git a/package.json b/package.json
index 820c06f..b7b4343 100644
--- a/package.json
+++ b/package.json
@@ -11,25 +11,32 @@
   },
   "devDependencies": {
     "axios": "^0.16.2",
-    "bootstrap": "^4.0.0-beta",
-    "cross-env": "^5.0.1",
-    "jquery": "^3.1.1",
-    "laravel-mix": "^1.6.1",
-    "lodash": "^4.17.4",
-    "popper.js": "^1.12.5",
-    "vue": "^2.5.3"
+    "bootstrap": "^4.1.1",
+    "cross-env": "^5.2.0",
+    "jquery": "^3.3.1",
+    "laravel-mix": "^1.7.2",
+    "lodash": "^4.17.10",
+    "popper.js": "^1.14.3",
+    "socket.io-client": "^2.1.1",
+    "vue": "^2.5.16",
+    "vue-template-compiler": "^2.5.16"
   },
   "dependencies": {
     "apollo-client": "^1.9.2",
-    "express": "^4.15.4",
+    "express": "^4.16.3",
     "font-awesome": "^4.7.0",
-    "ioredis": "^3.1.4",
-    "moment": "^2.18.1",
+    "ioredis": "^3.2.2",
+    "laravel-echo": "^1.3.4",
+    "moment": "^2.20.1",
+    "node-gyp": "^3.7.0",
     "node-gyp-install": "^2.2.0",
-    "socket.io": "^2.0.3",
+    "node-sass": "^4.9.2",
+    "nprogress": "^0.2.0",
+    "socket.io": "^2.1.1",
     "vue-apollo": "^2.1.0-rc.4",
-    "vue-froala-wysiwyg": "^2.0.0",
-    "vue2-editor": "^2.3.0",
+    "vue-froala-wysiwyg": "^2.8.4",
+    "vue-js-modal": "^1.3.16",
+    "vue2-editor": "^2.5.0",
     "vuex": "^3.0.1"
   }
-}
+}
\ No newline at end of file
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index de5fdd6..629e48f 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -58,7 +58,6 @@ Vue.component('example-text', require('./components/Example.vue'));
 Vue.component('ex-doc-editor', require('./components/ExampleAnalyser.vue'));
 
 
-
 var socket = io.connect(process.env.MIX_APP_SOCKET);
 import moment from 'moment';
 const app = new Vue({
@@ -78,17 +77,16 @@ const app = new Vue({
         }.bind(this));
 
         socket.on('private-dashboard:App\\Events\\InternetConnection\\Heartbeat', function () {
-            //console.log("ok yes listened");
+  //          console.log("ok yes listened");
             return this.lastHeartBeatReceivedAt = moment().format('LLL');
         }.bind(this));
 
         socket.on('private-dashboard:App\\Events\\Tap\\Health', function (data) {
-            //console.log("ok yes listened tap health");
+//            console.log("ok yes listened tap health");
             return this.tapHealth=data.health.message;
         }.bind(this));
 
-        socket.on('private-user-activity:App\\Events\\UserActivity', function (data) {
-            console.log("into user activity");
+        socket.on('private-user-activity:App\\Events\\UserActivity', function (data, dd) {
             //console.log(data);
             return this.userActivity.push(data);
         }.bind(this));
@@ -177,7 +175,6 @@ $(document).ready(function () {
 
     $('span[data-toggle=tooltip]').tooltip();
 
-
     //assignment feature info show hide
     let assignment_grammar = $("#grammar").val();
 
@@ -201,4 +198,4 @@ $(document).ready(function () {
 
 
 
-});
\ No newline at end of file
+});
diff --git a/resources/assets/js/components/Document.vue b/resources/assets/js/components/Document.vue
index ea30fbd..ec5a8c0 100644
--- a/resources/assets/js/components/Document.vue
+++ b/resources/assets/js/components/Document.vue
@@ -56,7 +56,7 @@
                 axios.get('/documents/all').then((response) => {
                     this.$data.lists = response.data.documents;
                 }, (err) => {
-                    this.$data.errors.push(e)
+                    this.$data.errors.push(err)
                 });
             },
             action(what, doc) {
@@ -70,7 +70,7 @@
                                 this.fetchDocuments();
                             }, 3000);
                         }, (err) => {
-                            this.$data.errors.push(e)
+                            this.$data.errors.push(err)
                         });
                     }
                 } else if(what === 'edit') {
diff --git a/resources/assets/js/components/TextAnalyser.vue b/resources/assets/js/components/TextAnalyser.vue
index ba389a6..7e782a1 100644
--- a/resources/assets/js/components/TextAnalyser.vue
+++ b/resources/assets/js/components/TextAnalyser.vue
@@ -6,9 +6,9 @@
 
             </div>
         </div> -->
-        <div class="row">
+        <div class="row" v-if="errors && errors.length">
             <div class="col-md-12">
-                <div v-if="errors && errors.length" class="col-md-12 alert alert-danger" role="alert">
+                <div  class="col-md-12 alert alert-danger" role="alert">
                     <ul>
                         <li v-for="error in errors">{{error.message}}</li>
                     </ul>
@@ -16,43 +16,12 @@
             </div>
         </div>
         <div class="row editWrapper">
-             <!-- <div id="sidebar" class="active" v-bind:class="this.attributes.grammar == 'analytical'? 'ana' : 'ref'">
-                <div class="p-3 bg-uts-primary text-white"><i class="fa fa-info-circle" aria-hidden="true"></i> Key
-                    <i class="fa fa-times-circle pull-right" aria-hidden="true" id="sidebarCollapseTwice"></i>
-                    <i class="fa fa-window-restore pull-right" aria-hidden="true" id="extendOut"></i>&nbsp;&nbsp;
-                </div>
-                <div class="col-md-12 col-xs-12" v-for="rule in feedback.rules">
-                    <h6 class="card-subtitle p-4" v-if="rule.custom">{{rule.custom}}</h6>
-                    <div v-for="msg in rule.message">
-                        <div class="row" v-for="(m,id) in msg">
-                            <div class="col-md-1 col-xs-1"><input type="checkbox" v-bind:id="id" v-bind:value="id" checked="checked"></div>
-                            <div class="col-md-10 col-xs-11"><span v-bind:class="id"></span>&nbsp;<span v-html="m"></span></div>
-                        </div>
-                    </div>
-                    <hr />
-                </div>
-            </div> -->
-
-            <!-- <div id="popup" class="active" v-bind:class="this.attributes.grammar == 'analytical'? 'ana' : 'ref'">
-                <div class="p-3 bg-uts-primary text-white"><i class="fa fa-info-circle" aria-hidden="true"></i> Key
-                </div>
-                <div class="col-md-12 col-xs-12" v-for="rule in feedback.rules">
-                    <h6 class="card-subtitle p-4" v-if="rule.custom">{{rule.custom}}</h6>
-                    <div v-for="msg in rule.message">
-                        <div class="row" v-for="(m,id) in msg">
-                            <div class="col-md-12 col-xs-12"><span v-bind:class="id"></span>&nbsp;<span v-html="m"></span></div>
-                        </div>
-                    </div>
-                    <hr />
-                </div>
-            </div> -->
-
 
             <!-- start content -->
             <div id="content" class="col-md-12">
                 <!-- <div class="card"> -->
                     <!-- <div class="card-header bg-dark text-white"> -->
-                        <div class="row bg-default">
+                        <div class="row shadow p-3 mb-5 bg-white rounded">
                             <div class="col-md-3"><h4 v-if="preSetAssignment">{{preSetAssignment.name}}</h4></div>
                             <div class="col-md-3 text-right"><span v-if="draftUpdate.message!=''">{{draftUpdate.message}}</span>
                                 <span v-if="auto!=''"><small>{{auto}}</small></span>
@@ -61,6 +30,7 @@
                             <div class="col-md-6 text-right"><!-- Auto feedback: <input type="checkbox" v-model="autofeedback" v-on:change="updateAutoFeedback()"/> -->&nbsp; &nbsp;
                                 <div class="btn-group pull-right" role="group" aria-label="Button group with nested dropdown">
                                     <button type="button" v-bind:disabled="getbtnStatus" class="btn btn-warning btn" v-on:click="fetchFeedback('manual')"><i class="fa fa-cloud-download"  aria-hidden="true"></i> Get Feedback & Save</button>&nbsp;
+                                    <a target="_blank" class="btn btn-warning btn" v-bind:href="getLink"><i class="fa fa-file-pdf-o"  aria-hidden="true"></i> Download PDF</a>&nbsp;
                                    <!-- <button type="button" class="btn brand-btn-outline-secondary btn-sm" v-on:click="storeAnalysedDrafts('manual')"><i class="fa fa-floppy-o" aria-hidden="true"></i> Save</button>&nbsp;
                                    <button type="button" id="sidebarCollapse" class="btn btn-dark btn-sm"><i class="fa fa-info-circle" aria-hidden="true"></i> Key</button> -->
 
@@ -69,7 +39,7 @@
                     <!-- </div> -->
 
                     </div>
-                <br />
+
                     <!-- <div class="card-body"> -->
                         <div class="row">
                             <div class="col-md-6 tab" id="original">
@@ -259,6 +229,17 @@
                 }  else {
                     return false;
                 }
+            },
+            getLink:function() {
+                let link='/generate-pdf/';
+                let data ={};
+
+                if(this.preSetAssignment) {
+                    data.id = (this.preSetAssignment.id * 123456); //this is the document id
+                    data.grammar = this.preSetAssignment.feature[0].grammar.toLocaleLowerCase();
+                    data.name= this.preSetAssignment.name;
+                }
+                return link+ JSON.stringify(data);
             }
         },
         watch :{
@@ -312,7 +293,14 @@
                 this.btnFeedback = true;
                 if(this.feedbackOpt!=='') {
                     // let data = {'tap': this.tap, 'txt':'', 'action': 'fetch', 'extra': this.attributes};
-                    let data = {'txt':this.editorContent, 'action': 'fetch', 'extra': this.attributes, 'type':type, 'document':this.preSetAssignment.id};
+                    let data = {
+                        'txt':this.editorContent,
+                        'action': 'fetch',
+                        'extra': this.attributes,
+                        'type':type,
+                        'document':this.preSetAssignment.id,
+                        'currentFeedback': this.feedback
+                    };
                     this.$store.dispatch('LOAD_FEEDBACK',data);
                     //this.autoCheck = false;
                 } else {
@@ -374,9 +362,10 @@
                 }
             },
             autoStore(){
-                setInterval(this.storeAnalysedDrafts, 60000);
+                setInterval(this.storeAnalysedDrafts, 300000);
             },
 
+
         }
     }
 </script>
\ No newline at end of file
diff --git a/resources/assets/js/components/analyser/Analytic.vue b/resources/assets/js/components/analyser/Analytic.vue
index 4c58cf2..dd08c35 100644
--- a/resources/assets/js/components/analyser/Analytic.vue
+++ b/resources/assets/js/components/analyser/Analytic.vue
@@ -2,6 +2,14 @@
     <div>
         <!--<p><small>Remember, AcaWriter does not really understand your writing, the way people do. You may have written beautifully crafted nonsense - that's for you to decide! Moreover, writing is complex, and AcaWriter will get it wrong sometimes. If you think it got it wrong, that's fine - now you're thinking about more than spelling, grammar and plagiarism.</small></p>-->
        <!-- <h4>Analytical Feedback</h4> -->
+       <!-- <div class="row">
+            <div class="col-md-12">
+                <div class="progress" v-if="processing!==''">
+                    <div class="progress-bar progress-bar-striped progress-bar-animated bg-warning" role="progressbar" style="width: 45%" aria-valuenow="10" aria-valuemin="0" aria-valuemax="100"></div>
+                </div>
+            </div>
+        </div> -->
+        <br />
     <ul class="nav nav-pills nav-fill bg-dark text-white">
         <li class="nav-item">
             <a class="nav-link active" href="#analysed" data-toggle="tab">Analytical Report</a>
@@ -28,12 +36,7 @@
             </div>
             </template>
             <hr />
-            <div class="col-md-12">
-                    <span v-if="processing!==''"  class="text-success">
-                        <i class="fa fa-spinner fa-spin"></i> {{processing}}
-                        <span class="sr-only">Loading...</span>
-                    </span>
-                </div>
+
                 <div class="col-md-12 wrapper">
                     <span v-for="(feed,idx) in feedback.final">
                         <span v-for="ic in feed.css">
@@ -47,10 +50,7 @@
                                <span class="badge badge-pill badge-analytic" v-bind:class="ic" v-html="getAnnotation(ic)"></span>
                             </template>
                         </span>
-                        <span v-html="feed.str" v-bind:class="[inLineAnaClasses(feed.css)]"
-                              data-placement="top" data-toggle="tooltip" data-html="true"
-                              v-bind:title="getTitle(feed.css)"
-                              data-original-title="">
+                        <span v-html="feed.str" v-bind:class="[inLineAnaClasses(feed.css)]">
                         </span>&nbsp;
                     </span>
                 </div>
@@ -66,19 +66,7 @@
                        </span>
                    </template>
                </span>
-
-
-
-              <!-- <div class="col-md-12 p-2">
-                   <div class="alert alert-success" role="alert">
-                       Thank you for submitting your draft to AcaWriter.Quality writing comes from revision. Research shows that writing drafts and revising your text helps improve the quality of your writing.
-                   </div>
-                   <div class="alert alert-danger"><small>Remember AcaWriter is a machine – so it may not highlight all your moves correctly and could give you incorrect feedback. So, don’t be afraid to disagree with the feedback, if you believe you have included all three moves in the correct order.</small> </div>
-
-               </div> -->
             </div>
-
-
         </template>
     </div>
     </div>
@@ -96,31 +84,25 @@
         store,
         data() {
             return {
-                analytic_xlator:[
-                    {'metrics': 'metrics'},
-                    {'emph': 'E'},
-                    {'grow': 'T'},
-                    {'contrast': 'C'},
-                    {'contribution': 'S'},
-                    {'nostat': 'Q'},
-                    {'tempstat': 'B'},
-                    {'attitude': 'P'},
-                    {'novstat': 'N'},
-                    {'surprise':'S'}
-
-                ],
+                analytic_xlator: {
+                    metrics: 'metrics',
+                    emph: 'E',
+                    grow: 'T',
+                    contrast: 'C',
+                    contribution: 'S',
+                    nostat: 'Q',
+                    tempstat: 'B',
+                    attitude: 'P',
+                    novstat: 'N',
+                    surprise: 'S'
+                }
             }
         },
         mounted:function() {
         },
         methods:{
             getAnnotation(ic) {
-                let tg = '';
-                this.analytic_xlator.forEach(function(val){
-                    if(val[ic]) {
-                        tg = val[ic];
-                    }
-                });
+                let tg = typeof this.analytic_xlator[ic]!=='undefined' ? this.analytic_xlator[ic] : '';
                 return tg;
             },
             inLineAnaClasses: function(data) {
@@ -171,10 +153,8 @@
                 let rules = this.feedback.rules;
 
                 tabs = rules.filter(rule => rule.tab  == 1);
-                console.log(tabs);
+
                 tabs.forEach(function(item) {
-                    console.log(item);
-                    console.log(item.check.tags);
                     if(item.check.tags.indexOf(tag)!== -1) mv.push(item.name);
                 });
                 //console.log(mv);
diff --git a/resources/assets/js/components/analyser/Reflective.vue b/resources/assets/js/components/analyser/Reflective.vue
index 0b74e2e..b0d8e08 100644
--- a/resources/assets/js/components/analyser/Reflective.vue
+++ b/resources/assets/js/components/analyser/Reflective.vue
@@ -1,16 +1,26 @@
 <template>
     <div>
+        <!-- <div class="row pbar">
+            <div class="col-md-12">
+                <div class="progress" v-if="processing!==''">
+                    <div class="progress-bar progress-bar-striped progress-bar-animated bg-danger" role="progressbar" style="width: 45%" aria-valuenow="10" aria-valuemin="0" aria-valuemax="100"></div>
+                </div>
+            </div>
+        </div> -->
+        <br />
+
         <ul class="nav nav-pills nav-fill bg-dark text-white">
             <li class="nav-item">
-                <a class="nav-link active" href="#analysed" data-toggle="tab">Reflective Report</small></a>
+                <a class="nav-link active" href="#analysed" data-toggle="tab">Reflective Report</a>
             </li>
            <li class="nav-item">
                 <a class="nav-link" href="#moreAna" data-toggle="tab">Feedback</a>
             </li>
         </ul>
+
          <div class="tab-content ref activeClass" id="legend">
             <div class="tab-pane active" id="analysed" role="tabpanel">
-                <div class="col-md-12 col-xs-12  bg-light" v-for="rule in feedback.rules">
+               <div class="bg-light ref_chk" v-for="rule in feedback.rules">
                     <h6 class="card-subtitle p-4" v-if="rule.custom">{{rule.custom}}</h6>
                     <ul class="list-inline">
                         <template v-for="msg in rule.message">
@@ -20,14 +30,8 @@
                             </li>
                         </template>
                     </ul>
-                </div>
-            <div class="col-md-12">
-                <span v-if="processing!=''" class="text-danger">
-                    <i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i>{{processing}}
-                        <span class="sr-only">Loading...</span>
-                    <hr />
-                </span>
             </div>
+                <hr />
             <div class="col-md-12 wrapper">
                 <span v-for="(feed,idx) in feedback.final">
                     <span v-for="ic in feed.css">
@@ -35,7 +39,7 @@
                             <span v-bind:class="getIcons(ic)"></span>
                         </template>
                     </span>
-                    <span v-html="inText(feed)" v-bind:class="[inLineClasses(feed.css)]"></span>
+                    <span v-html="inText(feed)" v-bind:class="[inLineClasses(feed.css)]"></span>&nbsp;
                 </span>
             </div>
             </div>
@@ -43,6 +47,7 @@
                  <div class="alert alert-info"><small>Remember, AcaWriter does not really understand your writing, the way people do. You may have written beautifully crafted nonsense - that's for you to decide! Moreover, writing is complex, and AcaWriter will get it wrong sometimes. If you think it got it wrong, that's fine - now you're thinking about more than spelling, grammar and plagiarism.</small></div>
              </div>
          </div>
+
     </div>
 </template>
 
@@ -58,6 +63,7 @@
         store,
         data() {
             return {
+
             }
         },
         mounted:function() {
@@ -75,11 +81,19 @@
                 return temp;
             },
             inText: function(data) {
+
+                var self = this;
+                //console.log(words);
                 if(data.str!=='' && typeof data.expression!== 'undefined') {
                     let str = data.str;
-                    if(data.expression.affect.length > 0) {
+                    if(data.expression.affect.length > 0 &&
+                        ( _.includes(data.css, "context")  || _.includes(data.css, "challenge") || _.includes(data.css, "change")
+                        )
+                    ) {
                         data.expression.affect.forEach(function(word) {
-                            str = str.replace(word.text, "<span class='stdaffect affect'>"+word.text+"</span>");
+                            if(!self.checkStopWords('affect', word.text)) {
+                                str = str.replace(word.text, "<span class='stdaffect affect'>" + word.text + "</span>");
+                            }
                         });
 
                     }
@@ -100,6 +114,23 @@
                     let str = '';
                     return str;
                 }
+            },
+            checkStopWords:function(tag, word) {
+                let words = [];
+                let result = false;
+                if(this.feedback.rules) {
+                    words = this.feedback.rules.filter((item) => item.name==='filterWords')
+                        .map((item) => item.check.list);
+                }
+
+                if(words.length > 0) {
+                    words.forEach(function(v) {
+                        if(_.includes(v.tags, tag) && _.includes(v.words, word)) {
+                            return true;
+                        }
+                    });
+                }
+                return result;
             }
         },
         computed:{
diff --git a/resources/assets/js/store/index.js b/resources/assets/js/store/index.js
index c93a07d..e091fac 100644
--- a/resources/assets/js/store/index.js
+++ b/resources/assets/js/store/index.js
@@ -4,6 +4,15 @@ import axios from 'axios'
 
 Vue.use(Vuex)
 
+axios.interceptors.request.use(config => {
+    NProgress.start();
+    return config;
+});
+
+axios.interceptors.response.use(config => {
+    NProgress.done();
+    return config;
+});
 
 const store = new Vuex.Store({
     state: {
diff --git a/resources/assets/sass/awa.scss b/resources/assets/sass/awa.scss
index d79fcf3..538952e 100644
--- a/resources/assets/sass/awa.scss
+++ b/resources/assets/sass/awa.scss
@@ -22,10 +22,13 @@
 
 .nav-pills .nav-link.active, .nav-pills .show > .nav-link {
   color: #FFFFFF;
-  background-color: #000000;
+ /* background-color: #000000; */
 }
 
-
+/* assignment */
+.hidefeature {
+  display: none;
+}
 
 #sidebar ul li.active > a,
 a[aria-expanded="true"] {
@@ -69,4 +72,25 @@ a[aria-expanded="true"] {
   .clear {
     clear: both;
     height: 60px;
-  }
\ No newline at end of file
+  }
+
+#nprogress .bar {
+  background: #ffc107;
+
+  position: fixed;
+  z-index: 1031;
+  top: 0;
+  left: 0;
+
+  width: 100%;
+  height: 7px;
+}
+
+#nprogress .peg {
+  box-shadow: 0 0 10px #ffc107, 0 0 5px #ffc107;
+}
+
+#nprogress .spinner-icon {
+  border-top-color: #ffc107;
+  border-left-color: #ffc107;
+}
\ No newline at end of file
diff --git a/resources/views/assignment.blade.php b/resources/views/assignment.blade.php
index 0ac93a1..7f012e9 100644
--- a/resources/views/assignment.blade.php
+++ b/resources/views/assignment.blade.php
@@ -12,29 +12,39 @@
                         <form class="form" method="POST" action="/assignment">
                             {{ csrf_field() }}
                             <div class="row">
-                                <div class="form-group col-md-6">
+                                <div class="form-group col-md-4">
                                     <label for="assignment-name">Title</label>
                                     <input type="text"  class="form-control" id="assignment-name" name="name" placeholder="assignment name"/>
                                 </div>
-                                <div class="col-md-6">
+                                <div class="col-md-8">
+                                    <label for="keywords">Assignment Short Description <small>(optional)</small></label>
+                                    <input class="form-control" id="keywords" type="text" name="keywords" placeholder="short description"/>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-md-4">
                                     <label for="feedbackOpt">Genre</label> <a href="/example"><i class="fa fa-question-circle"></i></a>
                                     <select class="form-control" id="grammar" name="grammar">
                                         @foreach($features as $key => $value)
-                                            <optgroup label="{{$key}}">
-                                                @foreach($value as $feature)
-                                                    <option value="{{$feature->id}}">{{$feature->name}}</option>
-                                                @endforeach
-                                            </optgroup>
+                                        <optgroup label="{{$key}}">
+                                            @foreach($value as $feature)
+                                            <option value="{{$feature->id}}">{{$feature->name}}</option>
+                                            @endforeach
+                                        </optgroup>
                                         @endforeach
                                     </select>
                                 </div>
+                                <div class="col-md-8">
+                                    <label for="featureInfo">Information about the genre</label><br />
+                                    @foreach($features as $key => $value)
+                                        @foreach($value as $feature)
+                                            <div class="feature_info" data-index="{{$feature->id}}"><small>{!! $feature->info !!}</small></div>
+                                        @endforeach
+                                    @endforeach
+                                </div>
                             </div>
                             <div class="row">
-                                <div class="col-md-10">
-                                    <label for="keywords">Short Description <small>(if applicable)</small></label>
-                                    <input class="form-control" id="keywords" type="text" name="keywords" placeholder="short description"/>
-                                </div>
-                                <div class="col-md-2"> <br />
+                                <div class="col-md-12"> <br />
                                     <button type="submit" class="btn btn-primary">Add</button>
                                 </div>
                             </div>
diff --git a/resources/views/contact.blade.php b/resources/views/contact.blade.php
index e956c2a..ae9c1ea 100644
--- a/resources/views/contact.blade.php
+++ b/resources/views/contact.blade.php
@@ -49,6 +49,10 @@
 
 
                             <p class="card-text">
+                                <strong><em>General Enquiries: </em></strong><br />
+                                <a href="mailto:cic@uts.edu.au">cic@uts.edu.au </a>
+                                <br />
+                            <hr />
                                 <strong><em>Academic questions:</em></strong><br /> Prof. Simon Buckingham Shum (CIC Director)<br />
                                 <a href="mailto:Simon.BuckinghamShum@uts.edu.au">Simon.BuckinghamShum@uts.edu.au </a>
                                 <br />
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 1e3c7ce..44e5724 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -10,6 +10,11 @@
 
     <title>AcaWriter | University of Technology Sydney</title>
 
+
+   <link href="https://unpkg.com/nprogress@0.2.0/nprogress.css" rel="stylesheet" />
+    <script src="https://unpkg.com/nprogress@0.2.0/nprogress.js"></script>
+
+
     <!-- Styles -->
     <link href="{{ asset('css/app.css') }}" rel="stylesheet">
 </head>
@@ -49,7 +54,7 @@
                         <li class="nav-item"><a class="nav-link" href="{{ url('/home')}}">My Dashboard</a></li>
                         <li class="nav-item"><a class="nav-link" href="{{url('example')}}">Example Texts</a></li>
                         <li class="nav-item"><a class="nav-link" href="{{ url('/assignment')}}">Manage Assignment</a></li>
-                        <li class="nav-item"><a class="nav-link" href="{{ url('/assignment')}}">Manage Users</a></li>
+                        <li class="nav-item"><a class="nav-link" href="{{ url('/admin/users')}}">Manage Users</a></li>
 
                         @elseif (Auth::user()->hasRole('staff'))
                         <li class="nav-item"><a class="nav-link" href="{{ url('/home')}}">My Dashboard</a></li>
@@ -100,6 +105,7 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/6.26.0/polyfill.min.js"></script>
 
     <script src="{{ asset('js/app.js') }}"></script>
+
     @include('layouts.footer')
 </body>
 </html>
diff --git a/resources/views/pdf/analytical.blade.php b/resources/views/pdf/analytical.blade.php
new file mode 100644
index 0000000..fcffe53
--- /dev/null
+++ b/resources/views/pdf/analytical.blade.php
@@ -0,0 +1,191 @@
+<!doctype html>
+<html lang="{{ app()->getLocale() }}">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+
+
+    <title>AcaWriter: PDF</title>
+
+    <!-- bootstrap styles -->
+    <!-- Latest compiled and minified CSS -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+
+    <!-- Optional theme -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
+
+    <!-- fontawesome
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
+    -->
+
+
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css">
+    <!-- customised css -->
+    <link href="/css/app.css" rel="stylesheet">
+    <style type="text/css">
+
+        @font-face {
+            font-family: 'fontawesome3';
+            src: url('https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/fonts/fontawesome-webfont.ttf?v=4.6.1') format('truetype');
+            font-weight: normal;
+            font-style: normal;
+        }
+
+        .fa {
+            display: inline-block;
+            font: normal normal normal 14px/1 fontawesome3;
+            text-rendering: auto;
+
+            -webkit-font-smoothing: antialiased;
+            -moz-osx-font-smoothing: grayscale;
+        }
+
+        .vocab , .context, .challenge, .wordcount, .metrics, .change, .background {
+            display: inline-block;
+            font: normal normal normal 14px/1 fontawesome3;
+            font-size: inherit;
+            text-rendering: auto;
+            -webkit-font-smoothing: antialiased;
+            -moz-osx-font-smoothing: grayscale;
+            padding:1px;
+        }
+
+
+        .vocab:before {
+            content: "\f05b";  /* this is your text. You can also use UTF-8 character codes as I do here */
+        }
+
+        .background:before {
+            content: "\f06a";  /* this is your text. You can also use UTF-8 character codes as I do here */
+            color: #721c24;
+        }
+
+        .metrics:before {
+            content: "\f0e7";
+            color: orangered;
+        }
+
+        .badge-analytic {
+            color:black;
+            background-color: darkorange;
+        }
+
+        .badge-analytic-green {
+            color:white;
+            background-color: darkgreen;
+        }
+
+
+        .ana_bg_green {
+            background-color: #00bfa5;
+        }
+
+        .ana_bg_yellow {
+            background-color:gold;
+        }
+
+        .moves1 {
+            background-color: #FFC1A3;
+        }
+
+        .moves3 {
+            background-color: #ADD164;
+        }
+
+        .moves2 {
+            background-color: #CBE3F5;
+        }
+
+
+    </style>
+
+
+
+    <!-- Fonts -->
+    <link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
+
+
+
+
+    <!-- Styles -->
+</head>
+<body>
+    <div class="row">
+        <div class="col-md-12"><h2>{{$draft->name}}</h2>
+            <strong>Genre: {{$draft->grammar}}&nbsp;</strong>
+            Date: &nbsp;{!! $draft->created_at !!}
+        </div>
+    </div>
+    <hr />
+
+    <div class="row">
+        <div class="col-md-12">
+            @foreach($draft->raw->rules as $rule)
+                @if(!isset($rule->tab))
+                    @if(isset($rule->custom) )
+                        <strong>{!!$rule->custom!!}</strong><br />
+                    @endif
+                    @foreach($rule->message as $msg)
+                        @foreach($msg as $key => $desc)
+                            <p>{!!$desc!!}</p>
+                        @endforeach
+                    @endforeach
+                @elseif($rule->tab==1)
+                    @if(isset($rule->custom) )
+                        <strong>{!! $rule->custom!!}</strong><br />
+                    @endif
+                    @foreach($rule->message as $msg)
+                        @foreach($msg as $key => $desc)
+                            <p class="{{$rule->name}}">{!!$desc!!}</p>
+                        @endforeach
+                    @endforeach
+                @endif
+            @endforeach
+        </div>
+    </div>
+    <hr />
+
+
+    <div class="row">
+        <div class="col-md-12">
+            <strong><u>Feedback with Annotations</u></strong>
+
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-12">
+            {!! $draft->annotated !!}
+        </div>
+    </div>
+
+<br />
+
+
+    <div class="row">
+        <div class="col-md-12">
+            @if(isset($draft->raw->tabs))
+                @foreach($draft->raw->tabs as $tab)
+                    @foreach($tab as $tabContent)
+                        @foreach($tabContent as $name => $b)
+                            @if($name!== 'faq')
+                               @foreach($b as $msg)
+                                    @foreach($msg as $txt)
+                                    {!! $txt !!}
+                                    @endforeach
+                                @endforeach
+                            @endif
+                        @endforeach
+                    @endforeach
+                @endforeach
+            @endif
+        </div>
+    </div>
+
+
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.3/socket.io.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/6.26.0/polyfill.min.js"></script>
+
+<script src="{{ asset('js/app.js') }}"></script>
+</body>
+</html>
diff --git a/resources/views/pdf/reflective.blade.php b/resources/views/pdf/reflective.blade.php
new file mode 100644
index 0000000..b8a2803
--- /dev/null
+++ b/resources/views/pdf/reflective.blade.php
@@ -0,0 +1,172 @@
+<!doctype html>
+<html lang="{{ app()->getLocale() }}">
+<head>
+    <meta http-equiv="Content-Type" content="charset=utf-8"/>
+
+
+    <title>AcaWriter: PDF</title>
+
+    <!-- bootstrap styles -->
+    <!-- Latest compiled and minified CSS -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+
+    <!-- Optional theme -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
+
+    <!-- fontawesome
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
+    -->
+
+
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css">
+    <!-- customised css -->
+    <link href="/css/app.css" rel="stylesheet">
+    <style type="text/css">
+        @font-face {
+            font-family: 'fontawesome3';
+            src: url('https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/fonts/fontawesome-webfont.ttf?v=4.6.1') format('truetype');
+            font-weight: normal;
+            font-style: normal;
+        }
+
+        .fa {
+            display: inline-block;
+            font: normal normal normal 14px/1 fontawesome3;
+            text-rendering: auto;
+
+            -webkit-font-smoothing: antialiased;
+            -moz-osx-font-smoothing: grayscale;
+        }
+
+        .vocab , .context, .challenge, .wordcount, .metrics, .change, .background {
+            display: inline-block;
+            font: normal normal normal 14px/1 fontawesome3;
+            font-size: inherit;
+            text-rendering: auto;
+            -webkit-font-smoothing: antialiased;
+            -moz-osx-font-smoothing: grayscale;
+            padding:1px;
+        }
+
+
+        .vocab:before {
+            content: "\f05b";  /* this is your text. You can also use UTF-8 character codes as I do here */
+        }
+
+        .background:before {
+            content: "\f06a";  /* this is your text. You can also use UTF-8 character codes as I do here */
+            color: #721c24;
+        }
+
+        .metrics:before {
+            content: "\f0e7";
+            color: orangered;
+        }
+
+        .affect {
+            border-bottom: 1px dashed #ff0000;
+        }
+
+        .epistemic {
+            text-decoration: underline;
+        }
+
+        .link2me {
+            font-weight:bold;
+        }
+
+        .modall {
+            font-style:italic;
+            color: darkgreen;
+        }
+
+        .challenge:before {
+            content: "\f111";  /* this is your text. You can also use UTF-8 character codes as I do here */
+            color:#C000C0;
+        }
+
+        .context:before {
+            content: "\f0c8";  /* this is your text. You can also use UTF-8 character codes as I do here */
+            color:#0000FF;
+
+        }
+
+        .change:before {
+            content: "\f04b";  /* this is your text. You can also use UTF-8 character codes as I do here */
+            color:#008300;
+        }
+    </style>
+
+    <!-- Fonts -->
+    <link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
+
+
+
+
+    <!-- Styles -->
+</head>
+<body>
+<div class="row">
+    <div class="col-md-12"><h2>{{$draft->name}}</h2>
+        <strong>Genre: {{$draft->grammar}}&nbsp;</strong>
+            Date: &nbsp;{!! $draft->created_at !!}
+    </div>
+</div>
+<hr />
+
+<div class="row">
+    <div class="col-md-12">
+        @foreach($draft->raw->rules as $rule)
+            @foreach($rule->message as $msg)
+                @foreach($msg as $key => $desc)
+                    <span class="{{$key}}"></span>&nbsp;{!!$desc!!} <br />
+                @endforeach
+            @endforeach
+        @endforeach
+    </div>
+</div>
+<hr />
+
+
+<div class="row">
+    <div class="col-md-12">
+        <strong><u>Feedback with Annotations</u></strong>
+        <br />
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-12">
+        {!! $draft->annotated !!}
+    </div>
+</div>
+
+<br />
+
+
+<div class="row">
+    <div class="col-md-12">
+
+        @foreach($draft->raw->tabs as $tab)
+        @foreach($tab as $tabContent)
+        @foreach($tabContent as $b)
+        @foreach($b as $msg)
+        @foreach($msg as $txt)
+        {!! $txt !!}
+        @endforeach
+        @endforeach
+        @endforeach
+        @endforeach
+        @endforeach
+
+    </div>
+</div>
+
+
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.3/socket.io.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/6.26.0/polyfill.min.js"></script>
+
+<script src="{{ asset('js/app.js') }}"></script>
+</body>
+</html>
diff --git a/resources/views/pdf/view.blade.php b/resources/views/pdf/view.blade.php
deleted file mode 100644
index a821d7a..0000000
--- a/resources/views/pdf/view.blade.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<!doctype html>
-<html lang="{{ app()->getLocale() }}">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-
-    <title>AcaWriter: PDF</title>
-
-    <!-- Fonts -->
-    <link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
-
-
-    <!-- Styles -->
-    <style>
-        html, body {
-            background-color: #fff;
-            color: #000000;
-            font-family: 'Arial', sans-serif;
-            /* font-weight: 100; */
-            height: 100vh;
-            margin: 0;
-        }
-
-        .full-height {
-            height: 100vh;
-        }
-
-        .flex-center {
-            align-items: center;
-            display: flex;
-            justify-content: center;
-        }
-
-        .position-ref {
-            position: relative;
-        }
-
-        .top-right {
-            position: absolute;
-            right: 10px;
-            top: 18px;
-        }
-
-        .content {
-            text-align: center;
-        }
-
-        .title {
-            font-size: 60px;
-        }
-
-        .links > a {
-            color: #636b6f;
-            padding: 0 25px;
-            font-size: 12px;
-            font-weight: 600;
-            letter-spacing: .1rem;
-            text-decoration: none;
-            text-transform: uppercase;
-        }
-
-        .m-b-md {
-            margin-bottom: 30px;
-        }
-    </style>
-</head>
-<body>
-    <div class="row">
-        <div class="col-md-12">
-            <h2>Feedback for document</h2>
-        </div>
-    </div>
-
-<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.3/socket.io.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/6.26.0/polyfill.min.js"></script>
-
-<script src="{{ asset('js/app.js') }}"></script>
-</body>
-</html>
diff --git a/resources/views/terms.blade.php b/resources/views/terms.blade.php
index 47f5dc6..5131b2a 100644
--- a/resources/views/terms.blade.php
+++ b/resources/views/terms.blade.php
@@ -12,9 +12,11 @@
                     <p class="card-text">
                         The Connected Intelligence Centre (CIC) complies with the UTS Governance strategy toward Privacy, as well as associated regulations and practices. See Privacy at UTS for more information.
                         In addition to the regular data collection associated with the normal running of a UTS teaching and research unit, CIC engages in activities across the University that will from time to time mean:
-                        The collection of additional data (eg student employment industry categories)
-                        Accessing existing data and reusing for a purpose not originally intended with its collection (eg, Learning Management System (LMS) logins)
-                        Combining more than one form of a data with another (eg LMS logins and grades)
+                        <ul>
+                        <li>The collection of additional data (eg student employment industry categories)</li>
+                        <li>Accessing existing data and reusing for a purpose not originally intended with its collection (eg, Learning Management System (LMS) logins)</li>
+                        <li>Combining more than one form of a data with another (eg LMS logins and grades)</li>
+                        </ul>
                     </p>
                     <h4>Collection</h4>
                     <p class="card-text">
diff --git a/routes/web.php b/routes/web.php
index 42c39bf..5be8e65 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -110,4 +110,4 @@
 
 //Genaerate and download pdf
 
-/* Route::get('/generate-pdf/{draftId}', 'PdfGeneratorController@pdfview'); */
\ No newline at end of file
+ Route::get('/generate-pdf/{draftId}', 'PdfGeneratorController@pdfview');
\ No newline at end of file