Yay almost ready to test