got all the numbers working correctly