Added some testing and some comments