diff --git a/src/arguments.go b/src/arguments.go
deleted file mode 100644
index bf15c68..0000000
--- a/src/arguments.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package main
-
-import (
-	"errors"
-	"fmt"
-	"os"
-)
-
-const (
-	helpArg         string = "--help"
-	helpArgShort    string = "-h"
-	versionArg      string = "--version"
-	versionArgShort string = "-v"
-	printArg        string = "--print"
-	printArgShort   string = "-p"
-	titleArg        string = "--title"
-	descriptionArg  string = "--description"
-	whereArg        string = "--where"
-	whenArg         string = "--when"
-)
-
-func listAllSingleArgs() []string {
-	return []string{
-		helpArg,
-		helpArgShort,
-		versionArg,
-		versionArgShort,
-	}
-}
-
-func listAllPairArgs() []string {
-	return []string{
-		printArg,
-		printArgShort,
-		titleArg,
-		descriptionArg,
-		whereArg,
-		whenArg,
-	}
-}
-
-func getArguments(rawArgs []string) map[string]string {
-	args, err := formatArguments(rawArgs)
-	if err != nil {
-		fmt.Printf("passed arguements are not valid. %s\n", err)
-		os.Exit(1)
-	}
-	return args
-}
-
-func formatArguments(rawArgs []string) (map[string]string, error) {
-	args := make(map[string]string)
-	emptyArgs := make(map[string]string)
-
-	if len(rawArgs) == 0 {
-		return emptyArgs, errors.New("at least one argument is required")
-	}
-	if isValidSingleArgument(rawArgs) {
-		return emptyArgs, nil
-	} else if len(rawArgs)%2 != 0 {
-		return emptyArgs, errors.New("each flag must have an argument")
-	}
-
-	for i := 0; i < len(rawArgs); i = i + 2 {
-		if rawArgs[i] == "" || rawArgs[i+1] == "" {
-			return emptyArgs, errors.New("arguments cannot be empty")
-		}
-
-		if !isValidPairArgument(rawArgs[i]) {
-			fmt.Printf(help())
-			return emptyArgs, nil
-		}
-		args[rawArgs[i]] = rawArgs[i+1]
-	}
-
-	return args, nil
-}
-
-func isValidSingleArgument(rawArgs []string) bool {
-	for _, element := range rawArgs {
-		if element == helpArg || element == helpArgShort {
-			fmt.Printf(help())
-			os.Exit(0)
-		}
-		if element == versionArg || element == versionArgShort {
-			fmt.Printf("%s\n", Version)
-			os.Exit(0)
-		}
-	}
-	return false
-}
-
-func isValidPairArgument(arg string) bool {
-	for _, element := range listAllPairArgs() {
-		if arg == element {
-			return true
-		}
-	}
-	return false
-}
-
-func help() string {
-	spacer := "----------------------------------------\n"
-	return " Argument     | Description\n" +
-		spacer +
-		"-h --help     | Prints the help function.\n" +
-		"-v --version  | Prints the version of the application.\n" +
-		spacer +
-		"--title       | Add title to record.\n" +
-		"--description | Add description to record.\n" +
-		"--where       | Add location to record.\n" +
-		"--when        | Add time to record. In format YYYY-MM-DD, can optionally take time HH:mm:SS\n" +
-		spacer +
-		"-p --print    | Prints the work done since date.\n"
-}
diff --git a/src/arguments_test.go b/src/arguments_test.go
deleted file mode 100644
index 4ebcaad..0000000
--- a/src/arguments_test.go
+++ /dev/null
@@ -1,107 +0,0 @@
-package main
-
-import (
-	"errors"
-	"testing"
-)
-
-func TestFormatArguments(t *testing.T) {
-	emptyFormattedArgs := make(map[string]string)
-
-	var tests = []struct {
-		name         string
-		rawArgs      []string
-		err          error
-		returnedArgs map[string]string
-	}{
-		{
-			"No args",
-			[]string{},
-			errors.New("at least one argument is required"),
-			emptyFormattedArgs,
-		}, {
-			"Single arg",
-			[]string{"-q"},
-			errors.New("each flag must have an argument"),
-			emptyFormattedArgs,
-		}, {
-			"Single version arg",
-			[]string{"--version"},
-			nil,
-			emptyFormattedArgs,
-		}, {
-			"Single short version arg",
-			[]string{"-v"},
-			nil,
-			emptyFormattedArgs,
-		}, {
-			"Single help arg",
-			[]string{"--help"},
-			nil,
-			emptyFormattedArgs,
-		}, {
-			"Single short help arg",
-			[]string{"-h"},
-			nil,
-			emptyFormattedArgs,
-		}, {
-			"Both empty args",
-			[]string{"", ""},
-			errors.New("arguments cannot be empty"),
-			emptyFormattedArgs,
-		}, {
-			"First arg empty",
-			[]string{"", "b"},
-			errors.New("arguments cannot be empty"),
-			emptyFormattedArgs,
-		}, {
-			"Second arg empty",
-			[]string{"a", ""},
-			errors.New("arguments cannot be empty"),
-			emptyFormattedArgs,
-		}, {
-			"One pair",
-			[]string{"--title", "b"},
-			nil,
-			map[string]string{"--title": "b"},
-		}, {
-			"Two pairs",
-			[]string{"--title", "b", "-p", "1d"},
-			nil,
-			map[string]string{"--title": "b", "-p": "1d"},
-		}, {
-			"Two unordered pairs",
-			[]string{"--title", "b", "-p", "1d"},
-			nil,
-			map[string]string{"-p": "1d", "--title": "b"},
-		}, {
-			"Duplicate is overridden",
-			[]string{"--title", "a", "--title", "b"},
-			nil,
-			map[string]string{"--title": "b"},
-		},
-	}
-
-	for _, testItem := range tests {
-		t.Run(testItem.name, func(t *testing.T) {
-			actualReturnedArgs, actualErr := formatArguments(testItem.rawArgs)
-
-			if testItem.err != nil && actualErr == nil {
-				t.Errorf("Should have errored with %s", testItem.err)
-			} else if actualErr != nil && testItem.err == nil {
-				t.Errorf("Was not supposed to error but did with %s", actualErr)
-			} else if testItem.err != nil && testItem.err.Error() != actualErr.Error() {
-				t.Errorf("Actual and expected errors are different. Actual: %s Expected: %s", actualErr, testItem.err)
-			}
-			if len(testItem.returnedArgs) != len(actualReturnedArgs) {
-				t.Errorf("Actual and expected number of returned args are different. Actual: %d Expected: %d",
-					len(actualReturnedArgs), len(testItem.returnedArgs))
-			}
-			for key := range actualReturnedArgs {
-				if actualReturnedArgs[key] != testItem.returnedArgs[key] {
-					t.Errorf("Actual returned element is different to the expected returned element")
-				}
-			}
-		})
-	}
-}
diff --git a/src/cmd/create.go b/src/cmd/create.go
new file mode 100644
index 0000000..a43dc68
--- /dev/null
+++ b/src/cmd/create.go
@@ -0,0 +1,55 @@
+package cmd
+
+import (
+	"time"
+
+	"github.com/PossibleLlama/worklog/model"
+
+	"github.com/PossibleLlama/worklog/helpers"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+var title string
+var description string
+var when time.Time
+var whenString string
+
+// createCmd represents the create command
+var createCmd = &cobra.Command{
+	Use:   "create",
+	Short: "Create a new record of work",
+	Long: `Creating a new record of work that
+the user has created.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		when, err := helpers.GetStringAsDateTime(whenString)
+		if err != nil {
+			return err
+		}
+
+		work := model.NewWork(title, description, viper.GetString("author"), "", helpers.TimeFormat(when))
+		_, err = wlService.CreateWorklog(work)
+		return err
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(createCmd)
+
+	createCmd.Flags().StringVar(
+		&title,
+		"title",
+		"",
+		"A short description of the work done")
+	createCmd.Flags().StringVar(
+		&description,
+		"description",
+		"",
+		"A description of the work")
+	createCmd.Flags().StringVar(
+		&whenString,
+		"when",
+		helpers.TimeFormat(time.Now()),
+		"When the work was worked in RFC3339 format")
+	createCmd.MarkFlagRequired("title")
+}
diff --git a/src/cmd/print.go b/src/cmd/print.go
new file mode 100644
index 0000000..ab2eaf0
--- /dev/null
+++ b/src/cmd/print.go
@@ -0,0 +1,48 @@
+package cmd
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/PossibleLlama/worklog/helpers"
+	"github.com/spf13/cobra"
+)
+
+var startDate time.Time
+var startDateString string
+
+// printCmd represents the print command
+var printCmd = &cobra.Command{
+	Use:   "print",
+	Short: "Print all worklogs since provided date",
+	Long: `Prints all worklogs to console that have
+been created since the start provided date.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		startDateAnytime, err := helpers.GetStringAsDateTime(startDateString)
+		startDate = helpers.Midnight(startDateAnytime)
+		if err != nil {
+			return err
+		}
+
+		worklogs, _, err := wlService.GetWorklogsSince(startDate)
+		if err != nil {
+			return err
+		}
+
+		for _, work := range worklogs {
+			fmt.Printf("%+v\n", work)
+		}
+		return nil
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(printCmd)
+
+	printCmd.Flags().StringVar(
+		&startDateString,
+		"startDate",
+		helpers.TimeFormat(time.Now()),
+		"Date from which to find worklogs")
+	printCmd.MarkFlagRequired("startDate")
+}
diff --git a/src/cmd/root.go b/src/cmd/root.go
new file mode 100644
index 0000000..401699a
--- /dev/null
+++ b/src/cmd/root.go
@@ -0,0 +1,73 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/PossibleLlama/worklog/repository"
+
+	"github.com/spf13/cobra"
+
+	"github.com/PossibleLlama/worklog/service"
+	homedir "github.com/mitchellh/go-homedir"
+	"github.com/spf13/viper"
+)
+
+var wlService service.WorklogService
+var wlRepo repository.WorklogRepository
+var cfgFile string
+
+// rootCmd represents the base command when called without any subcommands
+var rootCmd = &cobra.Command{
+	Use:   "worklog",
+	Short: "A productivity tool to track previous work",
+	Long: `A CLI tool to let people track what work they
+have completed. You can record what work you do,
+and get a summary of what you've done each day.
+
+For information on using the CLI, use worklog
+--help`,
+}
+
+// Execute adds all child commands to the root command and sets flags appropriately.
+// This is called by main.main(). It only needs to happen once to the rootCmd.
+func Execute() {
+	if err := rootCmd.Execute(); err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+}
+
+func init() {
+	cobra.OnInitialize(initConfig)
+	wlRepo = repository.NewYamlFileRepo()
+	wlService = service.NewWorklogService(wlRepo)
+
+	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.worklog/config.yml)")
+}
+
+// initConfig reads in config file and ENV variables if set.
+func initConfig() {
+	if cfgFile != "" {
+		// Use config file from the flag.
+		viper.SetConfigFile(cfgFile)
+	} else {
+		// Find home directory.
+		home, err := homedir.Dir()
+		if err != nil {
+			fmt.Println(err)
+			os.Exit(1)
+		}
+
+		// Search config in home directory with name ".worklog" (without extension).
+		viper.AddConfigPath(home)
+		viper.SetConfigName(".worklog/config")
+	}
+
+	viper.AutomaticEnv() // read in environment variables that match
+
+	// If a config file is found, read it in.
+	if err := viper.ReadInConfig(); err != nil {
+		fmt.Println("Unable to use config file:", viper.ConfigFileUsed())
+	}
+}
diff --git a/src/cmd/version.go b/src/cmd/version.go
new file mode 100644
index 0000000..945e532
--- /dev/null
+++ b/src/cmd/version.go
@@ -0,0 +1,22 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/PossibleLlama/worklog/helpers"
+
+	"github.com/spf13/cobra"
+)
+
+// versionCmd represents the version command
+var versionCmd = &cobra.Command{
+	Use:   "version",
+	Short: "Version of the app",
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Println(helpers.Version)
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(versionCmd)
+}
diff --git a/src/go.mod b/src/go.mod
index 2883c2c..b8903ed 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -2,4 +2,9 @@ module github.com/PossibleLlama/worklog
 
 go 1.15
 
-require gopkg.in/yaml.v2 v2.3.0
+require (
+	github.com/mitchellh/go-homedir v1.1.0
+	github.com/spf13/cobra v1.1.1
+	github.com/spf13/viper v1.7.1
+	gopkg.in/yaml.v2 v2.3.0
+)
diff --git a/src/go.sum b/src/go.sum
index 8fabe8d..c68596a 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -1,3 +1,302 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
+github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
+github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
+github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
+github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
+github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
+github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
+github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
+github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
+github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
+github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
+github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
+github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
+github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
+github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
+github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
+github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
+github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
+github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4=
+github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI=
+github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
+github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk=
+github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
+github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0 h1:HyfiK1WMnHj5FXFXatD+Qs1A/xC2Run6RzeW1SyHxpc=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
+gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
+gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
diff --git a/src/helpers/dates.go b/src/helpers/dates.go
new file mode 100644
index 0000000..013a906
--- /dev/null
+++ b/src/helpers/dates.go
@@ -0,0 +1,60 @@
+package helpers
+
+import (
+	"fmt"
+	"regexp"
+	"strings"
+	"time"
+)
+
+// These regex'es are not expected to be exhaustive.
+// They will be used to check whether this is likely
+// to be a date, and not a random string
+const dateRegex = `[0-9]{4}[-/ ][0-1][0-9][-/ ][0-3][0-9]`
+const timeRegex = `[0-2][0-9]:[0-5][0-9]:[0-5][0-9]`
+
+// TimeFormat formats a time to string
+func TimeFormat(t time.Time) string {
+	return t.Format(time.RFC3339)
+}
+
+// GetStringAsDateTime ensures a string is a dateTime
+func GetStringAsDateTime(rawElement string) (time.Time, error) {
+	element := strings.TrimSpace(rawElement)
+	var dateString string
+
+	isDate, dateErr := regexp.MatchString(`^`+dateRegex+`$`, element)
+	isDateTime, dateTimeErr := regexp.MatchString(`^`+dateRegex+`[\sT]`+timeRegex+`Z?$`, element)
+
+	if dateErr != nil || dateTimeErr != nil {
+		return time.Now(), fmt.Errorf("unable to parse string as date")
+	}
+
+	if isDateTime {
+		dateString = fmt.Sprintf("%s-%s-%sT%s:%s:%sZ",
+			string(element[0:4]),
+			string(element[5:7]),
+			string(element[8:10]),
+			string(element[11:13]),
+			string(element[14:16]),
+			string(element[17:19]))
+	} else if isDate {
+		dateString = fmt.Sprintf("%s-%s-%sT00:00:00Z",
+			string(element[0:4]),
+			string(element[5:7]),
+			string(element[8:10]))
+	} else {
+		dateString = element
+	}
+	date, err := time.Parse(time.RFC3339, dateString)
+	if err != nil {
+		return time.Now(), fmt.Errorf("unable to parse string as date. '%s'", err)
+	}
+	return date, nil
+}
+
+// Midnight tonight
+func Midnight(t time.Time) time.Time {
+	year, month, day := t.Date()
+	return time.Date(year, month, day, 0, 0, 0, 0, t.Location())
+}
diff --git a/src/helpers/dates_test.go b/src/helpers/dates_test.go
new file mode 100644
index 0000000..77708a0
--- /dev/null
+++ b/src/helpers/dates_test.go
@@ -0,0 +1,152 @@
+package helpers
+
+import (
+	"errors"
+	"strings"
+	"testing"
+	"time"
+)
+
+func TestTimeFormat(t *testing.T) {
+	parsedTime, err := time.Parse(time.RFC3339, "2000-01-02T01:23:45Z")
+	if err != nil {
+		t.Errorf("Initialization of test data failed with %s", err)
+	}
+
+	var tests = []struct {
+		name   string
+		input  time.Time
+		output string
+	}{
+		{
+			name:   "Valid RFC3339 date time is same",
+			input:  parsedTime,
+			output: "2000-01-02T01:23:45Z",
+		},
+	}
+
+	for _, testItem := range tests {
+		t.Run(testItem.name, func(t *testing.T) {
+			actual := TimeFormat(testItem.input)
+
+			if actual != testItem.output {
+				t.Errorf("Input '%s' was expected to be formated as '%s', but instead '%s'",
+					testItem.input,
+					testItem.output,
+					actual)
+			}
+		})
+	}
+}
+
+func TestGetStringAsDateTime(t *testing.T) {
+	expectedDateTimeMidnight, err := time.Parse(time.RFC3339, "2000-01-01T00:00:00Z")
+	if err != nil {
+		t.Errorf("Initialization of test data failed with %s", err)
+	}
+	expectedDateTimeMorning, err := time.Parse(time.RFC3339, "2000-01-01T09:35:54Z")
+	if err != nil {
+		t.Errorf("Initialization of test data failed with %s", err)
+	}
+
+	var tests = []struct {
+		name             string
+		dateTimeString   string
+		dateTimeExpected time.Time
+		err              error
+	}{
+		{
+			name:             "Valid date",
+			dateTimeString:   "2000-01-01",
+			dateTimeExpected: expectedDateTimeMidnight,
+			err:              nil,
+		},
+		{
+			name:             "Valid date. / instead of -",
+			dateTimeString:   "2000/01/01",
+			dateTimeExpected: expectedDateTimeMidnight,
+			err:              nil,
+		},
+		{
+			name:             "Valid date. Space instead of -",
+			dateTimeString:   "2000 01 01",
+			dateTimeExpected: expectedDateTimeMidnight,
+			err:              nil,
+		},
+		{
+			name:             "Valid date and time",
+			dateTimeString:   "2000-01-01T09:35:54",
+			dateTimeExpected: expectedDateTimeMorning,
+			err:              nil,
+		},
+		{
+			name:             "Valid date and time. Space instead of T",
+			dateTimeString:   "2000-01-01 09:35:54",
+			dateTimeExpected: expectedDateTimeMorning,
+			err:              nil,
+		},
+		{
+			name:             "Valid full date and time",
+			dateTimeString:   "2000-01-01T09:35:54Z",
+			dateTimeExpected: expectedDateTimeMorning,
+			err:              nil,
+		},
+		{
+			name:             "Valid full date and time with whitespace front",
+			dateTimeString:   "\t2000-01-01T09:35:54Z",
+			dateTimeExpected: expectedDateTimeMorning,
+			err:              nil,
+		},
+		{
+			name:             "Valid full date and time with whitespace end",
+			dateTimeString:   "2000-01-01T09:35:54Z ",
+			dateTimeExpected: expectedDateTimeMorning,
+			err:              nil,
+		},
+		{
+			name:             "Valid full date and time with whitespace front and end",
+			dateTimeString:   " 2000-01-01T09:35:54Z\n",
+			dateTimeExpected: expectedDateTimeMorning,
+			err:              nil,
+		},
+		{
+			name:             "Invalid string",
+			dateTimeString:   "err",
+			dateTimeExpected: time.Now(),
+			err:              errors.New("unable to parse string as date"),
+		},
+		{
+			name:             "Valid date with invalid postfix",
+			dateTimeString:   "2000-01-01 foo",
+			dateTimeExpected: expectedDateTimeMidnight,
+			err:              errors.New("cannot parse \" foo\" as \"T\""),
+		},
+		{
+			name:             "Valid date with invalid prefix",
+			dateTimeString:   "bar 2000-01-01",
+			dateTimeExpected: expectedDateTimeMidnight,
+			err:              errors.New("cannot parse \"bar 2000-01-01\" as \"2006\""),
+		},
+	}
+
+	for _, testItem := range tests {
+		t.Run(testItem.name, func(t *testing.T) {
+			actual, err := GetStringAsDateTime(testItem.dateTimeString)
+
+			if err != nil || testItem.err != nil {
+				if testItem.err == nil {
+					t.Errorf("Produced error %s when none expected", err)
+				} else if err == nil {
+					t.Error("Expected error to be produced, but none returned")
+				} else if !strings.Contains(err.Error(), testItem.err.Error()) {
+					t.Errorf("Expected error to contain '%s', but was '%s'",
+						testItem.err.Error(), err.Error())
+				}
+			} else {
+				if !actual.Equal(testItem.dateTimeExpected) {
+					t.Errorf("Expected %s to be returned from parsing %s, instead got %s", testItem.dateTimeExpected, testItem.dateTimeString, actual)
+				}
+			}
+		})
+	}
+}
diff --git a/src/helpers/version.go b/src/helpers/version.go
new file mode 100644
index 0000000..f810b69
--- /dev/null
+++ b/src/helpers/version.go
@@ -0,0 +1,6 @@
+package helpers
+
+const (
+	// Version keep track of the version of the application
+	Version string = "worklog-0.2.0"
+)
diff --git a/src/main.go b/src/main.go
index f7ab797..186fec0 100644
--- a/src/main.go
+++ b/src/main.go
@@ -1,149 +1,9 @@
 package main
 
 import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"gopkg.in/yaml.v2"
-)
-
-const (
-	// Version keep track of the version of the application
-	Version string = "worklog-0.1.0"
+	"github.com/PossibleLlama/worklog/cmd"
 )
 
 func main() {
-	metadataChan := make(chan MetadataFile)
-
-	go getMetadata(metadataChan)
-	args := getArguments(os.Args[1:])
-
-	metadata := <-metadataChan
-
-	work := record(args, metadata)
-	if work != nil {
-		store(work, metadata.RecordLocation)
-	} else {
-		print(args, metadata.RecordLocation)
-	}
-}
-
-func record(args map[string]string, metadata MetadataFile) *Work {
-	if title, contained := args[titleArg]; contained {
-		fmt.Printf("Saving file...\n")
-		return New(title,
-			args[descriptionArg],
-			metadata.Author,
-			args[whereArg],
-			args[whenArg])
-	}
-	return nil
-}
-
-func store(work *Work, location string) {
-	fileName := fmt.Sprintf("%d-%02d-%02d_%02d:%02d_%s",
-		work.When.Year(),
-		int(work.When.Month()),
-		work.When.Day(),
-		work.When.Hour(),
-		work.When.Minute(),
-		strings.ReplaceAll(work.Title, " ", "_"))
-
-	file, err := os.Create(location + fileName + ".yml")
-	if err != nil {
-		fmt.Printf("Unable to create file %s. %s\n",
-			location+work.When.String(),
-			err.Error())
-		os.Exit(1)
-	}
-	defer file.Close()
-
-	bytes, err := yaml.Marshal(*work)
-	if err != nil {
-		fmt.Printf("Unable to encode record. %s\n", work)
-		os.Exit(1)
-	}
-	file.Write(bytes)
-	file.Sync()
-	fmt.Println("Saved file")
-}
-
-func print(args map[string]string, location string) {
-	fmt.Printf("Retrieving files...\n")
-	previousDate := getPrintArgumentAsDate(args)
-	files := getFilesWithNameSinceDate(previousDate, location)
-
-	for index, fileName := range files {
-		printWorklogFromFile(fileName)
-		if index != (len(files) - 1) {
-			fmt.Println()
-		}
-	}
-}
-
-func getPrintArgumentAsDate(args map[string]string) time.Time {
-	dateShort, containedShort := args[printArgShort]
-	dateLong, containedLong := args[printArg]
-	var dateString string
-	if containedShort || containedLong {
-		if containedShort {
-			dateString = dateShort
-		} else {
-			dateString = dateLong
-		}
-	}
-	return getStringAsDate(dateString)
-}
-
-func getStringAsDate(element string) time.Time {
-	var dateString string
-	if len(element) == 10 {
-		dateString = fmt.Sprintf("%sT00:00:00Z", element)
-	} else {
-		dateString = element
-	}
-	date, err := time.Parse(time.RFC3339, dateString)
-	if err != nil {
-		fmt.Printf("Date to print from is not a valid date. %s\n", err.Error())
-		os.Exit(1)
-	}
-	return date
-}
-
-func getFilesWithNameSinceDate(date time.Time, location string) []string {
-	var files []string
-	err := filepath.Walk(location, func(fullPath string, info os.FileInfo, err error) error {
-		path := filepath.Base(fullPath)
-		if strings.Count(path, "_") < 1 {
-			return nil
-		}
-
-		filesDateAsString := strings.Split(path, "_")[0]
-		filesDate := getStringAsDate(filesDateAsString)
-
-		if filesDate.After(date) {
-			files = append(files, fullPath)
-		}
-		return nil
-	})
-	if err != nil {
-		fmt.Printf("Error getting files from location %s. %e\n", location, err)
-		os.Exit(1)
-	}
-	return files
-}
-
-func printWorklogFromFile(filePath string) {
-	var worklog Work
-	yamlFile, err := ioutil.ReadFile(filePath)
-	if err != nil {
-		fmt.Printf("Error reading file %s. %e\n", filePath, err)
-	}
-	yaml.Unmarshal(yamlFile, &worklog)
-
-	fmt.Printf("%+v \n", worklog)
+	cmd.Execute()
 }
diff --git a/src/metadata.go b/src/metadata.go
deleted file mode 100644
index 9d46815..0000000
--- a/src/metadata.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package main
-
-import (
-	"strings"
-	"fmt"
-	"io/ioutil"
-	"os"
-
-	"gopkg.in/yaml.v2"
-)
-
-const (
-	configFileName	string = "config.yml"
-)
-
-// MetadataFile information added to each worklog
-type MetadataFile struct {
-	Author			string `yaml:"author"`
-	RecordLocation	string `yaml:"recordLocation"`
-}
-
-func getMetadata(metadataChan chan<- MetadataFile) {
-	var file MetadataFile
-	filePath := os.Getenv("HOME") + "/.worklog/"
-	configFilePath := filePath + configFileName
-
-	data, err := ioutil.ReadFile(configFilePath)
-	if err != nil {
-		fmt.Printf("cannot open file: %s\n", configFilePath)
-		metadataChan <- MetadataFile{}
-	}
-
-	err = yaml.Unmarshal(data, &file)
-	if err != nil {
-		fmt.Printf("cannot unmarshal data: %s\n", err)
-		metadataChan <- MetadataFile{}
-	}
-
-	if file.Author == "" {
-		fmt.Printf("unable to get 'author' property from ~%s file.\n", configFileName)
-		os.Exit(1)
-	}
-	file.RecordLocation = strings.ReplaceAll(file.RecordLocation, "~", os.Getenv("HOME"))
-	if file.RecordLocation == "" {
-		file.RecordLocation = filePath
-	}
-
-	if file.RecordLocation[len(file.RecordLocation)-1:] != "/" {
-		file.RecordLocation += "/"
-	}
-
-	metadataChan <- file
-}
diff --git a/src/work.go b/src/model/work.go
similarity index 88%
rename from src/work.go
rename to src/model/work.go
index 86b4b58..867cfe1 100644
--- a/src/work.go
+++ b/src/model/work.go
@@ -1,4 +1,4 @@
-package main
+package model
 
 import (
 	"fmt"
@@ -19,8 +19,8 @@ type Work struct {
 	Created     time.Time
 }
 
-// New is the generator for work.
-func New(title, description, author, where, when string) *Work {
+// NewWork is the generator for work.
+func NewWork(title, description, author, where, when string) *Work {
 	nowString := time.Now().Format(time.RFC3339)
 	now, err := time.Parse(time.RFC3339, nowString)
 	if err != nil {
@@ -61,10 +61,10 @@ func (w Work) String() string {
 	if w.Where != "" {
 		finalString = fmt.Sprintf("%s Where: %s,", finalString, w.Where)
 	}
-	if ! w.When.Equal(time.Time{}) {
+	if !w.When.Equal(time.Time{}) {
 		finalString = fmt.Sprintf("%s When: %s,", finalString, w.When)
 	}
-	if ! w.Created.Equal(time.Time{}) {
+	if !w.Created.Equal(time.Time{}) {
 		finalString = fmt.Sprintf("%s Created: %s,", finalString, w.Created)
 	}
 	return strings.TrimSpace(finalString[:len(finalString)-1])
diff --git a/src/work_test.go b/src/model/work_test.go
similarity index 70%
rename from src/work_test.go
rename to src/model/work_test.go
index 8d701d3..b942247 100644
--- a/src/work_test.go
+++ b/src/model/work_test.go
@@ -1,4 +1,4 @@
-package main
+package model
 
 import (
 	"fmt"
@@ -13,14 +13,14 @@ func TestNewWork(t *testing.T) {
 		t.Error("Unable to parse initial date")
 	}
 
-	var tests = []struct{
-		name string
-		wTitle string
+	var tests = []struct {
+		name         string
+		wTitle       string
 		wDescription string
-		wAuthor string
-		wWhere string
-		wWhen string
-		expected Work
+		wAuthor      string
+		wWhere       string
+		wWhen        string
+		expected     Work
 	}{
 		{
 			"Short date",
@@ -30,11 +30,11 @@ func TestNewWork(t *testing.T) {
 			"location",
 			validStringDate,
 			Work{
-				Title: "title",
+				Title:       "title",
 				Description: "description",
-				Author: "who",
-				Where: "location",
-				When: validDate,
+				Author:      "who",
+				Where:       "location",
+				When:        validDate,
 			},
 		}, {
 			"Full date",
@@ -44,11 +44,11 @@ func TestNewWork(t *testing.T) {
 			"location",
 			fmt.Sprintf("%sT00:00:00Z", validStringDate),
 			Work{
-				Title: "title",
+				Title:       "title",
 				Description: "description",
-				Author: "who",
-				Where: "location",
-				When: validDate,
+				Author:      "who",
+				Where:       "location",
+				When:        validDate,
 			},
 		}, {
 			"No when",
@@ -58,10 +58,10 @@ func TestNewWork(t *testing.T) {
 			"location",
 			"",
 			Work{
-				Title: "title",
+				Title:       "title",
 				Description: "description",
-				Author: "who",
-				Where: "location",
+				Author:      "who",
+				Where:       "location",
 			},
 		},
 	}
@@ -69,7 +69,7 @@ func TestNewWork(t *testing.T) {
 	for _, testItem := range tests {
 		t.Run(testItem.name, func(t *testing.T) {
 			before := time.Now()
-			actual := New(testItem.wTitle, testItem.wDescription, testItem.wAuthor, testItem.wWhere, testItem.wWhen)
+			actual := NewWork(testItem.wTitle, testItem.wDescription, testItem.wAuthor, testItem.wWhere, testItem.wWhen)
 			after := time.Now()
 
 			if actual.Title != testItem.expected.Title {
@@ -89,11 +89,11 @@ func TestNewWork(t *testing.T) {
 					t.Errorf("Should have when %s, instead has %s", testItem.expected.When, actual.When)
 				}
 			} else {
-				if actual.When.Equal(actual.Created) {
-					t.Error("When and created should be the same")
+				if !actual.When.Equal(actual.Created) {
+					t.Errorf("When '%s' and created '%s' should be the same", actual.When, actual.Created)
 				}
 			}
-			if time.Since(before) < time.Since(actual.Created) {
+			if time.Since(actual.Created) < time.Since(before) {
 				t.Error("Was not created after start of test")
 			}
 			if time.Since(actual.Created) < time.Since(after) {
@@ -101,4 +101,4 @@ func TestNewWork(t *testing.T) {
 			}
 		})
 	}
-}
\ No newline at end of file
+}
diff --git a/src/repository/repositories.go b/src/repository/repositories.go
new file mode 100644
index 0000000..5825a45
--- /dev/null
+++ b/src/repository/repositories.go
@@ -0,0 +1,15 @@
+package repository
+
+import (
+	"time"
+
+	"github.com/PossibleLlama/worklog/model"
+)
+
+// WorklogRepository defines what a repository
+// for worklogs should be capable of doing
+type WorklogRepository interface {
+	Save(wl *model.Work) error
+
+	GetAllSinceDate(startDate time.Time) ([]*model.Work, error)
+}
diff --git a/src/repository/yamlFileRepo.go b/src/repository/yamlFileRepo.go
new file mode 100644
index 0000000..293d5f8
--- /dev/null
+++ b/src/repository/yamlFileRepo.go
@@ -0,0 +1,140 @@
+package repository
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/PossibleLlama/worklog/helpers"
+	"github.com/PossibleLlama/worklog/model"
+	homedir "github.com/mitchellh/go-homedir"
+	"github.com/spf13/viper"
+	"gopkg.in/yaml.v2"
+)
+
+type yamlFileRepo struct{}
+
+// NewYamlFileRepo Generator for repository storing worklogs
+// on the fs, in a yaml format
+func NewYamlFileRepo() WorklogRepository {
+	return &yamlFileRepo{}
+}
+
+func (*yamlFileRepo) Save(wl *model.Work) error {
+	fmt.Println("Saving file...")
+
+	file, err := createFile(generateFileName(wl))
+	defer file.Close()
+	if err != nil {
+		return fmt.Errorf("unable to save worklog. %s", err.Error())
+	}
+
+	bytes, err := yaml.Marshal(*wl)
+	if err != nil {
+		return fmt.Errorf("unable to save worklog. %s", err.Error())
+	}
+	file.Write(bytes)
+	file.Sync()
+
+	fmt.Println("Saved file")
+	return nil
+}
+
+func generateFileName(wl *model.Work) string {
+	filePath := viper.GetString("recordLocation")
+	if filePath == "" {
+		filePath = getWorklogDir()
+	}
+
+	fileName := fmt.Sprintf("%d-%02d-%02d_%02d:%02d_%s",
+		wl.When.Year(),
+		int(wl.When.Month()),
+		wl.When.Day(),
+		wl.When.Hour(),
+		wl.When.Minute(),
+		strings.ReplaceAll(
+			strings.TrimSpace(wl.Title), " ", "_"))
+	return filePath + fileName + ".yml"
+}
+
+func getWorklogDir() string {
+	home, err := homedir.Dir()
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+	return home + "/.worklog/"
+}
+
+func createFile(fileName string) (*os.File, error) {
+	file, err := os.Create(fileName)
+	if err != nil {
+		return nil, fmt.Errorf("unable to create file %s. %s",
+			fileName, err.Error())
+	}
+	return file, nil
+}
+
+func (*yamlFileRepo) GetAllSinceDate(startDate time.Time) ([]*model.Work, error) {
+	fmt.Println("Retrieving files...")
+
+	var worklogs []*model.Work
+	var errors []string
+
+	fileNames, err := getAllFileNamesFrom(startDate)
+	if err != nil {
+		return worklogs, err
+	}
+
+	for _, fileName := range fileNames {
+		readWorklog, err := parseFileToWork(fileName)
+		if err != nil {
+			errors = append(errors, err.Error())
+		} else {
+			worklogs = append(worklogs, readWorklog)
+		}
+	}
+	if len(errors) != 0 {
+		return worklogs, fmt.Errorf("unable to get all files. %s",
+			strings.Join(errors, ", "))
+	}
+	return worklogs, nil
+}
+
+func getAllFileNamesFrom(startDate time.Time) ([]string, error) {
+	var files []string
+
+	err := filepath.Walk(getWorklogDir(), func(fullPath string, info os.FileInfo, err error) error {
+		path := filepath.Base(fullPath)
+		if strings.Count(path, "_") < 1 {
+			return nil
+		}
+
+		splitFileName := strings.Split(path, "_")
+		filesDateAsString := fmt.Sprintf("%sT%s:00Z", splitFileName[0], splitFileName[1])
+		filesDate, err := helpers.GetStringAsDateTime(filesDateAsString)
+		if err != nil {
+			return err
+		}
+
+		if filesDate.After(startDate) {
+			files = append(files, fullPath)
+		}
+		return nil
+	})
+
+	return files, err
+}
+
+func parseFileToWork(filePath string) (*model.Work, error) {
+	var worklog model.Work
+	yamlFile, err := ioutil.ReadFile(filePath)
+	if err != nil {
+		return nil, fmt.Errorf("error reading file %s. %e", filePath, err)
+	}
+	err = yaml.Unmarshal(yamlFile, &worklog)
+	return &worklog, err
+}
diff --git a/src/service/services.go b/src/service/services.go
new file mode 100644
index 0000000..eae6bf2
--- /dev/null
+++ b/src/service/services.go
@@ -0,0 +1,43 @@
+package service
+
+import (
+	"net/http"
+	"time"
+
+	"github.com/PossibleLlama/worklog/model"
+	"github.com/PossibleLlama/worklog/repository"
+)
+
+// WorklogService defines what a service for
+// worklogs should be capable of doing
+type WorklogService interface {
+	CreateWorklog(wl *model.Work) (int, error)
+	GetWorklogsSince(date time.Time) ([]*model.Work, int, error)
+}
+
+type service struct{}
+
+var (
+	repo repository.WorklogRepository
+)
+
+// NewWorklogService Generator for service while initialising the storage capability
+func NewWorklogService(repository repository.WorklogRepository) WorklogService {
+	repo = repository
+	return &service{}
+}
+
+func (*service) CreateWorklog(wl *model.Work) (int, error) {
+	if err := repo.Save(wl); err != nil {
+		return http.StatusInternalServerError, err
+	}
+	return http.StatusCreated, nil
+}
+
+func (*service) GetWorklogsSince(date time.Time) ([]*model.Work, int, error) {
+	worklogs, err := repo.GetAllSinceDate(date)
+	if err != nil {
+		return worklogs, http.StatusInternalServerError, err
+	}
+	return worklogs, http.StatusOK, nil
+}