Commenting out the test section, need to write tests