trying to get these damn commits to not screw up everything