I think the right solution what kevin and I were both getting at here. #17