diff --git a/ISO27001effectiveness/DESCRIPTION b/ISO27001effectiveness/DESCRIPTION
index 1ceae03..5842733 100644
--- a/ISO27001effectiveness/DESCRIPTION
+++ b/ISO27001effectiveness/DESCRIPTION
@@ -8,4 +8,5 @@ Description: More about what it does (maybe more than one line)
     Use four spaces when indenting paragraphs within the Description.
 License: What license is it under?
 Encoding: UTF-8
-LazyData: true
\ No newline at end of file
+LazyData: true
+RoxygenNote: 5.0.1
diff --git a/ISO27001effectiveness/Main.R b/ISO27001effectiveness/Main.R
index 4fb690c..9b8363c 100644
--- a/ISO27001effectiveness/Main.R
+++ b/ISO27001effectiveness/Main.R
@@ -6,6 +6,8 @@ Cert_PerCountry <- ParseExcelFileRaw("./data/ISO/iso_27001_iso_survey2015_prepro
 Sites_PerCountry <- ParseExcelFileRaw("./data/ISO/iso_27001_iso_survey2015_preprocessed.xlsx", 2)
 Cert_PerSector <- ParseExcelFileRaw("./data/ISO/iso_27001_iso_survey2015_preprocessed.xlsx", 3)
 
-Cert_PerCountry <- ProccesISOSurveyByCountryRaw(Cert_PerCountry, c("X2010", "X2011", "X2012", "X2013", "X2014", "X2015"))
-Sites_PerCountry <- ProccesISOSurveyByCountryRaw(Sites_PerCountry, c("X2010", "X2011", "X2012", "X2013", "X2014", "X2015"))
-#Cert_PerSector <- ProccesISOSurveyRaw(Cert_PerSector, c("X2010", "X2011", "X2012", "X2013", "X2014", "X2015"))
+Cert_PerCountry <- ProccesISOSurveyByCountryRaw(Cert_PerCountry, c("X2012", "X2013", "X2014", "X2015"))
+Sites_PerCountry <- ProccesISOSurveyByCountryRaw(Sites_PerCountry, c( "X2012", "X2013", "X2014", "X2015"))
+#Cert_PerSector <- ProccesISOSurveyRaw(Cert_PerSector, c("X2012", "X2013", "X2014", "X2015"))
+
+Attacks <- GetAttacksData()
diff --git a/ISO27001effectiveness/NAMESPACE b/ISO27001effectiveness/NAMESPACE
index d75f824..6ae9268 100644
--- a/ISO27001effectiveness/NAMESPACE
+++ b/ISO27001effectiveness/NAMESPACE
@@ -1 +1,2 @@
-exportPattern("^[[:alpha:]]+")
+# Generated by roxygen2: do not edit by hand
+
diff --git a/ISO27001effectiveness/R/Hackmageddon_Parser.R b/ISO27001effectiveness/R/Hackmageddon_Parser.R
index 8cf1d21..7708f30 100644
--- a/ISO27001effectiveness/R/Hackmageddon_Parser.R
+++ b/ISO27001effectiveness/R/Hackmageddon_Parser.R
@@ -4,33 +4,62 @@
 
 
 
-ParseHMExcel <- function(file){
+ParseHMExcel <- function(file, cols){
   print(file)
   if (!file.exists(file)) {
     stop(paste("Error, file [", file, "] not found"))
   }
-  dataset <- read.xlsx2(file, 1, header = TRUE,colIndex = 2:10, colClasses = c("Date", "character", "character", "character", "character", "character", "character", "character"))
+  dataset <- xlsx::read.xlsx2(file, 1, header = TRUE,colIndex = cols, colClasses = c("numeric", "character", "character", "character"))
+
+  if (is.null(dataset$Date)) {
+    dataset <- xlsx::read.xlsx2(file, 1, header = TRUE,colIndex = cols, colClasses = c("numeric", "character", "character", "character"), startRow = 2)
+  }
+
   dataset
 }
 
 ProccesHMRaw <- function(dataset.raw){
 
   #Remove rows with Date NA
+  print(class(dataset.raw$Date))
   dataset <- dataset.raw[!is.na(dataset.raw$Date),]
+  dataset$Date <- as.POSIXct(dataset$Date*86400, tz ="GMT", origin ="1904-01-01")
 
   dataset
 }
 
-ParseHMFolder <- function(folder){
+#' Title
+#'
+#' @param folder
+#' @param cols
+#'
+#' @return
+#' @export
+#'
+#' @examples
+ParseHMFolder <- function(folder, cols){
   filelist <- list.files(folder)
   #frames <- lapply(paste(folder,filelist,sep = ""),ParseHMExcel)
-  dataset <- ProccesHMRaw(ParseHMExcel(paste(folder,filelist[1],sep = "/")))
+
+  myFile <- paste(folder,filelist[1],sep = "")
+  dataset <- ProccesHMRaw(ParseHMExcel(myFile, cols))
 
   for (i in 2:length(filelist)) {
-    dataset <- rbind(dataset, ProccesHMRaw(ParseHMExcel(paste(folder,filelist[i],sep = "/"))))
+    dataset <- rbind(dataset, ProccesHMRaw(ParseHMExcel(paste(folder,filelist[i],sep = ""), cols)))
   }
 
   dataset
 }
 
+GetAttacksData <- function() {
+
+  format1 <- ParseHMFolder("./data/hackmageddon/Format1/", c(2, 9, 7, 6))
+  format2 <- ParseHMFolder("./data/hackmageddon/Format2/", c(2,7, 5, 6))
+  format3 <- ParseHMFolder("./data/hackmageddon/Format3/", c(2, 9, 7, 6))
+  format4 <- ParseHMFolder("./data/hackmageddon/Format4/", c(1, 9, 5, 3))
+
+  dataset <- rbind(format1, format2, format3, format4)
+
+  dataset
+}
 
diff --git a/ISO27001effectiveness/R/ISOSurvey_Parser.R b/ISO27001effectiveness/R/ISOSurvey_Parser.R
index d74c0c5..d436ec5 100644
--- a/ISO27001effectiveness/R/ISOSurvey_Parser.R
+++ b/ISO27001effectiveness/R/ISOSurvey_Parser.R
@@ -21,7 +21,7 @@ ParseExcelFileRaw <- function(file, sheet){
     stop(paste("Error, file [", file, "] not found"))
   }
 
-  dataset <- read.xlsx2(file, sheet,colClasses = c("character","numeric","numeric","numeric","numeric","numeric","numeric","numeric","numeric","numeric","numeric"), header = TRUE, as.data.frame = TRUE)
+  dataset <- xlsx::read.xlsx2(file, sheet,colClasses = c("character","numeric","numeric","numeric","numeric","numeric","numeric","numeric","numeric","numeric","numeric"), header = TRUE, as.data.frame = TRUE)
 
   dataset
 }
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/1-15 April 2016 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 April 2016 Cyber Attacks Timeline.xlsx
index 7a23af7..7a23af7 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/1-15 April 2016 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 April 2016 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2015/1-15 August 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 August 2015 Cyber Attacks Timeline.xlsx
index 757a040..757a040 100644
--- a/ISO27001effectiveness/data/hackmageddon/2015/1-15 August 2015 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 August 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format1/1-15 December 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 December 2015 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..bf14502
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 December 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/1-15 February 2016 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 February 2016 Cyber Attacks Timeline.xlsx
index f9fe8ea..f9fe8ea 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/1-15 February 2016 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 February 2016 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/1-15 January 2016 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 January 2016 Cyber Attacks Timeline.xlsx
index d9a61ba..d9a61ba 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/1-15 January 2016 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 January 2016 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format1/1-15 Jul 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 Jul 2015 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..f63baa5
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 Jul 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/1-15 July 2016 Cyber Attacks Timelines.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 July 2016 Cyber Attacks Timelines.xlsx
index 97c7bde..97c7bde 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/1-15 July 2016 Cyber Attacks Timelines.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 July 2016 Cyber Attacks Timelines.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/1-15 June 2016 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 June 2016 Cyber Attacks Timeline.xlsx
index 01ed92e..01ed92e 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/1-15 June 2016 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 June 2016 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/1-15 March 2016 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 March 2016 Cyber Attacks Timeline.xlsx
index 3d190d4..3d190d4 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/1-15 March 2016 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 March 2016 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/1-15 May 2016 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 May 2016 Cyber Attacks Timeline.xlsx
index e7e58df..e7e58df 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/1-15 May 2016 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 May 2016 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2015/1-15 November 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 November 2015 Cyber Attacks Timeline.xlsx
index 0a25786..0a25786 100644
--- a/ISO27001effectiveness/data/hackmageddon/2015/1-15 November 2015 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 November 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2015/1-15 October 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 October 2015 Cyber Attacks Timeline.xlsx
index 0d010b9..0d010b9 100644
--- a/ISO27001effectiveness/data/hackmageddon/2015/1-15 October 2015 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 October 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/1-15 October 2016 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 October 2016 Cyber Attacks Timeline.xlsx
index 292d0e5..292d0e5 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/1-15 October 2016 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 October 2016 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2015/1-15 September 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 September 2015 Cyber Attacks Timeline.xlsx
index 8eaf4f2..8eaf4f2 100644
--- a/ISO27001effectiveness/data/hackmageddon/2015/1-15 September 2015 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 September 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/1-15 September 2016 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 September 2016 Cyber Attacks Timeline.xlsx
index 41954d7..41954d7 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/1-15 September 2016 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/1-15 September 2016 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/1-16 August 2016 Cyber Attacks Timelines.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/1-16 August 2016 Cyber Attacks Timelines.xlsx
index d73d744..d73d744 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/1-16 August 2016 Cyber Attacks Timelines.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/1-16 August 2016 Cyber Attacks Timelines.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/16-29 February 2016 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/16-29 February 2016 Cyber Attacks Timeline.xlsx
index 00fecec..00fecec 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/16-29 February 2016 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/16-29 February 2016 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/16-30 July 2016 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/16-30 July 2016 Cyber Attacks Timeline.xlsx
index 1726a89..1726a89 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/16-30 July 2016 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/16-30 July 2016 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/16-30 June 2016 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/16-30 June 2016 Cyber Attacks Timeline.xlsx
index 925cc36..925cc36 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/16-30 June 2016 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/16-30 June 2016 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2015/16-30 November 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/16-30 November 2015 Cyber Attacks Timeline.xlsx
index 7aafc90..7aafc90 100644
--- a/ISO27001effectiveness/data/hackmageddon/2015/16-30 November 2015 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/16-30 November 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2015/16-30 September 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/16-30 September 2015 Cyber Attacks Timeline.xlsx
index 4ed4675..4ed4675 100644
--- a/ISO27001effectiveness/data/hackmageddon/2015/16-30 September 2015 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/16-30 September 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/16-30 September 2016 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/16-30 September 2016 Cyber Attacks Timeline.xlsx
index fb7a34d..fb7a34d 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/16-30 September 2016 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/16-30 September 2016 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/16-31 April 2016 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 April 2016 Cyber Attacks Timeline.xlsx
index a688e81..a688e81 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/16-31 April 2016 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 April 2016 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2015/16-31 August 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 August 2015 Cyber Attacks Timeline.xlsx
index 7737010..7737010 100644
--- a/ISO27001effectiveness/data/hackmageddon/2015/16-31 August 2015 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 August 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/16-31 August 2016 Cyber Attacks Timelines.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 August 2016 Cyber Attacks Timelines.xlsx
index 20d1cbe..20d1cbe 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/16-31 August 2016 Cyber Attacks Timelines.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 August 2016 Cyber Attacks Timelines.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format1/16-31 December 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 December 2015 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..a100454
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 December 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/16-31 January 2016 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 January 2016 Cyber Attacks Timeline.xlsx
index 7417819..7417819 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/16-31 January 2016 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 January 2016 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format1/16-31 July Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 July Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..4babed1
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 July Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/16-31 March 2016 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 March 2016 Cyber Attacks Timeline.xlsx
index c689376..c689376 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/16-31 March 2016 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 March 2016 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/16-31 May 2016 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 May 2016 Cyber Attacks Timeline.xlsx
index 9619bf9..9619bf9 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/16-31 May 2016 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 May 2016 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2015/16-31 October 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 October 2015 Cyber Attacks Timeline.xlsx
index 8cbcfbc..8cbcfbc 100644
--- a/ISO27001effectiveness/data/hackmageddon/2015/16-31 October 2015 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 October 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/2016/16-31 October 2016 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 October 2016 Cyber Attacks Timeline.xlsx
index c0d1942..c0d1942 100644
--- a/ISO27001effectiveness/data/hackmageddon/2016/16-31 October 2016 Cyber Attacks Timeline.xlsx
+++ b/ISO27001effectiveness/data/hackmageddon/Format1/16-31 October 2016 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format2/16-30 Apr 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format2/16-30 Apr 2015 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..7c5c901
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format2/16-30 Apr 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format2/Stats May 2015.xlsx b/ISO27001effectiveness/data/hackmageddon/Format2/Stats May 2015.xlsx
new file mode 100644
index 0000000..5cc291e
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format2/Stats May 2015.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Apr 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Apr 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..d6c28b3
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Apr 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Apr 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Apr 2015 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..28b07e0
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Apr 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/1-15 August 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 August 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..82e3033
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 August 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/1-15 December 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 December 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..1e427cf
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 December 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Feb 2014 Cyber Attacks Timeline XLS.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Feb 2014 Cyber Attacks Timeline XLS.xlsx
new file mode 100644
index 0000000..db206bc
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Feb 2014 Cyber Attacks Timeline XLS.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Feb 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Feb 2015 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..2a5a83f
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Feb 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Jan 2014 Cyber Attacks Timeline.xls b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Jan 2014 Cyber Attacks Timeline.xls
new file mode 100644
index 0000000..9334a2f
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Jan 2014 Cyber Attacks Timeline.xls
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Jan 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Jan 2015 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..8f10562
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Jan 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/1-15 June 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 June 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..671a997
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 June 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Mar 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Mar 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..265ceb9
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Mar 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Mar 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Mar 2015 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..92fcbc0
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 Mar 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/1-15 May 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 May 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..2178582
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 May 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/1-15 November 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 November 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..feceb32
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 November 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/1-15 October 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 October 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..f999e01
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 October 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/1-15 September 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 September 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..db410a4
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/1-15 September 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/16-28 Feb 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/16-28 Feb 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..a473587
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/16-28 Feb 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/16-28 Feb 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/16-28 Feb 2015 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..767abf6
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/16-28 Feb 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/16-30 Apr 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/16-30 Apr 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..5f1ae60
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/16-30 Apr 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/16-30 Sep 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/16-30 Sep 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..45c1023
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/16-30 Sep 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Aug 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Aug 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..d088c45
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Aug 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/16-31 December 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 December 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..471bf19
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 December 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Jan 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Jan 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..91005f3
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Jan 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Jan 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Jan 2015 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..4a8e670
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Jan 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Jul 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Jul 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..4b03b7d
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Jul 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Jun 2014 Cyber Attacks Timeline(1).xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Jun 2014 Cyber Attacks Timeline(1).xlsx
new file mode 100644
index 0000000..5a9144e
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Jun 2014 Cyber Attacks Timeline(1).xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Jun 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Jun 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..5db0c45
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Jun 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Mar 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Mar 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..5780129
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Mar 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Mar 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Mar 2015 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..b38e8d3
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Mar 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/16-31 May 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 May 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..1cc1b6e
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 May 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Nov 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Nov 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..669dc96
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Nov 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Oct 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Oct 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..ad458e3
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format3/16-31 Oct 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format4/Hackmageddon2013 Def3.xlsx b/ISO27001effectiveness/data/hackmageddon/Format4/Hackmageddon2013 Def3.xlsx
new file mode 100644
index 0000000..c96da0b
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format4/Hackmageddon2013 Def3.xlsx
diff --git a/ISO27001effectiveness/data/hackmageddon/Format4/hackmageddon 2012 def.xlsx b/ISO27001effectiveness/data/hackmageddon/Format4/hackmageddon 2012 def.xlsx
new file mode 100644
index 0000000..c5b9d1c
--- /dev/null
+++ b/ISO27001effectiveness/data/hackmageddon/Format4/hackmageddon 2012 def.xlsx
diff --git a/ISO27001effectiveness/data/test/16-31 Mar 2014 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/test/16-31 Mar 2014 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..5780129
--- /dev/null
+++ b/ISO27001effectiveness/data/test/16-31 Mar 2014 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/data/test/16-31 Mar 2015 Cyber Attacks Timeline.xlsx b/ISO27001effectiveness/data/test/16-31 Mar 2015 Cyber Attacks Timeline.xlsx
new file mode 100644
index 0000000..b38e8d3
--- /dev/null
+++ b/ISO27001effectiveness/data/test/16-31 Mar 2015 Cyber Attacks Timeline.xlsx
diff --git a/ISO27001effectiveness/man/GetCountryAbrev.Rd b/ISO27001effectiveness/man/GetCountryAbrev.Rd
new file mode 100644
index 0000000..d89bc47
--- /dev/null
+++ b/ISO27001effectiveness/man/GetCountryAbrev.Rd
@@ -0,0 +1,16 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/Util.R
+\name{GetCountryAbrev}
+\alias{GetCountryAbrev}
+\title{Return the 2 letter code of a country relation}
+\usage{
+GetCountryAbrev()
+}
+\value{
+data.frame
+}
+\description{
+Relation of country names included in the ISO Survey input file with 2 letter code
+included on the hackmaggedon input files
+}
+
diff --git a/ISO27001effectiveness/man/LoadParserLibraries.Rd b/ISO27001effectiveness/man/LoadParserLibraries.Rd
new file mode 100644
index 0000000..99261a0
--- /dev/null
+++ b/ISO27001effectiveness/man/LoadParserLibraries.Rd
@@ -0,0 +1,14 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/Util.R
+\name{LoadParserLibraries}
+\alias{LoadParserLibraries}
+\title{Install and load required libraries}
+\usage{
+LoadParserLibraries()
+}
+\description{
+This function checks if every required library is installed to be loaded, if not they will be installed and then loaded.
+Libraries installed:
+ xlsx to parse excel files like ISO survey source format
+}
+
diff --git a/ISO27001effectiveness/man/ParseExcelFileRaw.Rd b/ISO27001effectiveness/man/ParseExcelFileRaw.Rd
new file mode 100644
index 0000000..60a85cc
--- /dev/null
+++ b/ISO27001effectiveness/man/ParseExcelFileRaw.Rd
@@ -0,0 +1,25 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/ISOSurvey_Parser.R
+\name{ParseExcelFileRaw}
+\alias{ParseExcelFileRaw}
+\title{Get data frame from an excel file}
+\usage{
+ParseExcelFileRaw(file, sheet)
+}
+\arguments{
+\item{file}{path to excel file}
+
+\item{sheet}{index of sheet to parse}
+}
+\value{
+data.frame
+}
+\description{
+Check if the file exists and then parse it into a data.frame
+}
+\examples{
+Cert_PerCountry <- ParseExcelFileRaw("./data/ISO/iso_27001_iso_survey2015_preprocessed.xlsx", 1)
+Sites_PerCountry <- ParseExcelFileRaw("./data/ISO/iso_27001_iso_survey2015_preprocessed.xlsx", 2)
+Cert_PerSector <- ParseExcelFileRaw("./data/ISO/iso_27001_iso_survey2015_preprocessed.xlsx", 3)
+}
+
diff --git a/ISO27001effectiveness/man/ProccesISOSurveyByCountryRaw.Rd b/ISO27001effectiveness/man/ProccesISOSurveyByCountryRaw.Rd
new file mode 100644
index 0000000..b866edd
--- /dev/null
+++ b/ISO27001effectiveness/man/ProccesISOSurveyByCountryRaw.Rd
@@ -0,0 +1,26 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/ISOSurvey_Parser.R
+\name{ProccesISOSurveyByCountryRaw}
+\alias{ProccesISOSurveyByCountryRaw}
+\title{Process raw data from ISO survey}
+\usage{
+ProccesISOSurveyByCountryRaw(dataset.raw, years)
+}
+\arguments{
+\item{dataset.raw}{raw data from ISO Survey excel file}
+
+\item{years}{List of years to return, c("X2006", "X2010", ...)}
+}
+\value{
+data.frame
+}
+\description{
+Proccess the raw data from ISO survey to replace NAs, normalizate country names and filter years
+}
+\examples{
+
+Cert_PerCountry <- ProccesISOSurveyRaw(Cert_PerCountry, c("X2010", "X2011", "X2012", "X2013", "X2014", "X2015"))
+Sites_PerCountry <- ProccesISOSurveyRaw(Sites_PerCountry, c("X2010", "X2011", "X2012", "X2013", "X2014", "X2015"))
+Cert_PerSector <- ProccesISOSurveyRaw(Cert_PerSector, c("X2010", "X2011", "X2012", "X2013", "X2014", "X2015"))
+}
+