Done with the implementation and unit testing

Now to see if this actually works...