Still trying to fix stuff