Added some basic code and a test