Missed this so redid it.

I am still not happy with the repository, going to redo it here soon and
make it work nice with Autofac or some IoC container.