Still trying to get the new approach to work right