another round

mostly needs help getting the actual results in place