Still trying to fix things up