Working on testing and new functionality