Started testing and added some functionality