Still trying to work through commit issues...