Add testing in, make things promise