diff --git a/DESCRIPTION b/DESCRIPTION
index b42f547..6589608 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -14,7 +14,8 @@ Imports:
 Suggests:
     testthat,
     jsonlite,
-    httr
+    httr,
+    AWR.Kinesis
 Description: Provides a simple yet powerful logging utility. Based loosely on
     log4j, futile.logger takes advantage of R idioms to make logging a
     convenient and easy to use replacement for cat and print statements.
diff --git a/R/appender.R b/R/appender.R
index 6071082..f42ae75 100644
--- a/R/appender.R
+++ b/R/appender.R
@@ -105,82 +105,38 @@ appender.console <- function()
   function(line) cat(line, sep='')
 }
 
-# Write to a file.
-appender.file <- function(file)
-{
-  function(line) cat(line, file=file, append=TRUE, sep='')
-}
 
-# Write to a file and to console 
-appender.tee <- function(file){ 
+#' Kinesis Firehose and console appender
+#' 
+#' @param stream Firehose stream name
+#' @param region_name Firehose stream region
+#' @export
+appender.kinesis_firehose <- function(mykey, secret_key){ 
+  library(rcticloud)
   function(line) {
     cat(line, sep='') 
-    cat(line, file=file, append=TRUE, sep='')
-  }
-}
+    
+    myhose <- RFIREHOSE$new(uid = mykey, pwd = secret_key)
 
-# Write to a dynamically-named file (and optionally the console), with inheritance
-appender.file2 <- function(format, console=FALSE, inherit=TRUE,
-                           datetime.fmt="%Y%m%dT%H%M%S") {
-  .nswhere <- -3 # get name of the function 2 deep in the call stack
-                 # that is, the function that has called flog.*
-  .funcwhere <- -3 # ditto for the function name
-  .levelwhere <- -1 # ditto for the current "level"
-  function(line) {
-    if (console) cat(line, sep='')
-    err <- function(e) {
-      stop('Illegal function call, must call from flog.trace, flog.debug, flog.info, flog.warn, flog.error, flog.fatal, etc.')
-    }
-    the.level <- tryCatch(get("level", envir=sys.frame(.levelwhere)),error = err)
-    the.threshold <- tryCatch(get('logger',envir=sys.frame(.levelwhere)), error=err)$threshold
-    if(inherit) {
-      LEVELS <- c(FATAL, ERROR, WARN, INFO, DEBUG, TRACE)
-      levels <- names(LEVELS[the.level <= LEVELS & LEVELS <= the.threshold])
-    } else levels <- names(the.level)
-    the.time <- format(Sys.time(), datetime.fmt)
-    the.namespace <- flog.namespace(.nswhere)
-    the.namespace <- ifelse(the.namespace == 'futile.logger', 'ROOT', the.namespace)
-    the.function <- .get.parent.func.name(.funcwhere)
-    the.pid <- Sys.getpid()
-    filename <- gsub('~t', the.time, format, fixed=TRUE)
-    filename <- gsub('~n', the.namespace, filename, fixed=TRUE)
-    filename <- gsub('~f', the.function, filename, fixed=TRUE)
-    filename <- gsub('~p', the.pid, filename, fixed=TRUE)
-    if(length(grep('~l', filename)) > 0) {
-      sapply(levels, function(level) {
-        filename <- gsub('~l', level, filename, fixed=TRUE)
-        cat(line, file=filename, append=TRUE, sep='')
-      })
-    }else cat(line, file=filename, append=TRUE, sep='')
-    invisible()
-  }
-}
 
+    
+    
+    
+ myhose$put_record(data = line)
+    
+    
+    
 
-# Special meta appender that prints only when the internal counter mod n = 0
-appender.modulo <- function(n, appender=appender.console()) {
-  i <- 0
-  function(line) {
-    i <<- i + 1
-    if (i %% n == 0) appender(sprintf("[%s] %s", i,line))
-    invisible()
   }
 }
 
-# Write to a Graylog2 HTTP GELF Endpoint
-appender.graylog <- function(server, port, debug = FALSE) {
 
-  if (!requireNamespace("jsonlite", quietly=TRUE))
-    stop("appender.graylog requires jsonlite. Please install it.", call. = FALSE)
-  if (!requireNamespace("httr", quietly=TRUE))
-    stop("appender.graylog requires httr. Please install it.", call. = FALSE)  
-  
-  function(line) {
 
-    ret <- httr::POST(paste0("http://", server, ":", port, "/gelf"), 
-                      body = list(short_message = line),
-                      encode = 'json')
-    
-    if (debug) print(ret)
-  }
-}
+
+
+
+
+
+
+
+
diff --git a/R/layout.R b/R/layout.R
index 5c012d5..a9e843f 100644
--- a/R/layout.R
+++ b/R/layout.R
@@ -1,98 +1,3 @@
-#' Manage layouts within the 'futile.logger' sub-system
-#' 
-#' Provides functions for managing layouts. Typically 'flog.layout' is only
-#' used when manually creating a logging configuration.
-#' 
-#' @section Usage:
-#' # Get the layout function for the given logger\cr
-#' flog.layout(name) \%::\% character : Function\cr
-#' flog.layout(name='ROOT')
-#' 
-#' # Set the layout function for the given logger\cr
-#' flog.layout(fn, name='ROOT')
-#' 
-#' # Decorate log messages with a standard format\cr
-#' layout.simple(level, msg, ...)
-#' 
-#' # Decorate log messages with a standard format and a pid\cr
-#' layout.simple.parallel(level, msg, ...)
-#'
-#' # Generate log messages as JSON\cr
-#' layout.json(level, msg, ...)
-#'
-#' # Decorate log messages using a custom format\cr
-#' layout.format(format, datetime.fmt="%Y-%m-%d %H:%M:%S")
-#'
-#' # Show the value of a single variable
-#' layout.tracearg(level, msg, ...)
-#' 
-#' # Generate log messages in a Graylog2 HTTP GELF accetable format
-#' layout.graylog(common.fields)
-#' 
-#' @section Details:
-#' Layouts are responsible for formatting messages so they are human-readable.
-#' Similar to an appender, a layout is assigned to a logger by calling 
-#' \code{flog.layout}. The \code{flog.layout} function is used internally
-#' to get the registered layout function. It is kept visible so 
-#' user-level introspection is possible.
-#' 
-#' \code{layout.simple} is a pre-defined layout function that 
-#' prints messages in the following format:\cr
-#'   LEVEL [timestamp] message
-#'
-#' This is the default layout for the ROOT logger.
-#' 
-#' \code{layout.format} allows you to specify the format string to use 
-#' in printing a message. The following tokens are available.
-#' \describe{
-#' \item{~l}{Log level}
-#' \item{~t}{Timestamp}
-#' \item{~n}{Namespace}
-#' \item{~f}{The calling function}
-#' \item{~m}{The message}
-#' \item{~p}{The process PID}
-#' \item{~i}{Logger name}
-#' }
-#'
-#' \code{layout.json} converts the message and any additional objects provided
-#' to a JSON structure. E.g.:
-#' 
-#' flog.info("Hello, world", cat='asdf')
-#'  
-#' yields something like
-#' 
-#' \{"level":"INFO","timestamp":"2015-03-06 19:16:02 EST","message":"Hello, world","func":"(shell)","cat":["asdf"]\}
-#' 
-#' \code{layout.tracearg} is a special layout that takes a variable
-#' and prints its name and contents.
-#' 
-#' \code{layout.graylog} is a special layout for use with the appender.graylog to
-#' generate json acceptable to a Graylog2 HTTP GELF endpoint. Standard fields to
-#' be included with every message can be included by setting the common.fields
-#' to a list of properties. E.g.: 
-#' 
-#' flog.layout(layout.graylog(common.fields = list(host_ip = "10.10.11.23", 
-#'                                                 env = "production")))
-#' 
-#' @name flog.layout
-#' @aliases layout.simple layout.simple.parallel layout.format layout.tracearg layout.json layout.graylog
-#' @param \dots Used internally by lambda.r
-#' @author Brian Lee Yung Rowe
-#' @seealso \code{\link{flog.logger}} \code{\link{flog.appender}}
-#' @keywords data
-#' @examples
-#' # Set the layout for 'my.package'
-#' flog.layout(layout.simple, name='my.package')
-#'
-#' # Update the ROOT logger to use a custom layout
-#' layout <- layout.format('[~l] [~t] [~n.~f] ~m')
-#' flog.layout(layout)
-#' 
-#' # Create a custom logger to trace variables
-#' flog.layout(layout.tracearg, name='tracer')
-#' x <- 5
-#' flog.info(x, name='tracer')
-NULL
 
 # Get the layout for the given logger
 flog.layout(name) %::% character : Function
@@ -109,6 +14,8 @@ flog.layout(fn, name='ROOT') %as%
   invisible()
 }
 
+
+
 # This file provides some standard formatters
 # This prints out a string in the following format:
 #   LEVEL [timestamp] message
@@ -121,19 +28,8 @@ layout.simple <- function(level, msg, id='', ...)
   }
   sprintf("%s [%s] %s\n", names(level),the.time, msg)
 }
-
-layout.simple.parallel <- function(level, msg, id='', ...)
-{
-  the.time <- format(Sys.time(), "%Y-%m-%d %H:%M:%S")
-  the.pid  <- Sys.getpid()
-  if (length(list(...)) > 0) {
-    parsed <- lapply(list(...), function(x) if(is.null(x)) 'NULL' else x)
-    msg <- do.call(sprintf, c(msg, parsed))
-  }
-  sprintf("%s [%s %s] %s\n", names(level), the.time, the.pid, msg)
-}
-
-# Get name of a parent function in call stack
+                     
+ # Get name of a parent function in call stack
 # @param .where: where in the call stack. -1 means parent of the caller.
 .get.parent.func.name <- function(.where) {
   the.function <- tryCatch(deparse(sys.call(.where - 1)[[1]]), 
@@ -144,23 +40,49 @@ layout.simple.parallel <- function(level, msg, id='', ...)
   the.function
 }
 
+
+
+
+
+
+
 # Generates a list object, then converts it to JSON and outputs it
-layout.json <- function(level, msg, id='', ...) {
+layout.json <- function(user_id=NA,session_id=NA){
+
+
+the.user_id <- ifelse(user_id %in% c('', 'futile.logger'), 'ROOT', user_id) 
+the.session_id<- ifelse(session_id %in% c('', 'futile.logger'), 'ROOT', session_id) 
+
+
+function(level, msg, id='', ...) {
   if (!requireNamespace("jsonlite", quietly=TRUE))
     stop("layout.json requires jsonlite. Please install it.", call.=FALSE)
   
   the.function <- .get.parent.func.name(-3) # get name of the function 
                                             # 3 deep in the call stack
+  the.id <- ifelse(id %in% c('', 'futile.logger'), 'ROOT', id) 
+  
   
   output_list <- list(
+    app_name=jsonlite::unbox(the.id),
+    
+    user_id=jsonlite::unbox(the.user_id),
+    session_id=jsonlite::unbox(the.session_id),
+    
+    
     level=jsonlite::unbox(names(level)),
     timestamp=jsonlite::unbox(format(Sys.time(), "%Y-%m-%d %H:%M:%S %z")),
+    calling_function=jsonlite::unbox(the.function),
     message=jsonlite::unbox(msg),
-    func=jsonlite::unbox(the.function),
     additional=...
   )
   paste0(jsonlite::toJSON(output_list, simplifyVector=TRUE), '\n')
 }
+}
+
+
+
+
 
 # This parses and prints a user-defined format string. Available tokens are
 # ~l - Log level
@@ -198,58 +120,4 @@ layout.format <- function(format, datetime.fmt="%Y-%m-%d %H:%M:%S")
   }
 }
 
-layout.tracearg <- function(level, msg, id='', ...)
-{
-  the.time <- format(Sys.time(), "%Y-%m-%d %H:%M:%S")
-  if (is.character(msg)) {
-    if (! is.null(substitute(...))) msg <- sprintf(msg, ...)
-  } else {
-    external.call <- sys.call(-2)
-    external.fn <- eval(external.call[[1]])
-    matched.call <- match.call(external.fn, external.call)
-    matched.call <- matched.call[-1]
-    matched.call.names <- names(matched.call)
-
-    ## We are interested only in the msg and ... parameters,
-    ## i.e. in msg and all parameters not explicitly declared
-    ## with the function
-    is.output.param <- matched.call.names == "msg" |
-      !(matched.call.names %in% c(setdiff(names(formals(external.fn)), "...")))
-
-    label <- lapply(matched.call[is.output.param], deparse)
-    msg <- sprintf("%s: %s", label, c(msg, list(...)))
-  }
-  sprintf("%s [%s] %s\n", names(level),the.time, msg)
-}
 
-
-# This creates a json string that will work with the appender.graylog
-layout.graylog <- function(common.fields, datetime.fmt="%Y-%m-%d %H:%M:%S")
-{
-  .where = -3 # get name of the function 3 deep in the call stack
-  # that is, the function that has called flog.*
-  
-  missing.common.fields <- missing(common.fields)
-  
-  function(level, msg, id='', ...) {
-    
-    if (! is.null(substitute(...))) msg <- sprintf(msg, ...)
-    
-    the.namespace <- flog.namespace(.where)
-    
-    output_list <- list(
-      flogger_level = names(level),
-      time = format(Sys.time(), datetime.fmt), 
-      namespace = ifelse(the.namespace == 'futile.logger', 'ROOT', the.namespace),
-      func = .get.parent.func.name(.where), 
-      pid = Sys.getpid(),
-      message = msg
-    )
-    
-    if (!missing.common.fields)
-      output_list <- c(output_list, common.fields)
-    
-    jsonlite::toJSON(output_list, auto_unbox = TRUE)
-    
-  }
-}  
\ No newline at end of file