I added testing and stuff