BUG:  Still trying to get timing right.