Starting to fix stuff