Added some stuff.
Added some basic functionality and unit tests.