I'm not even sure if this should be committed but it was already here and I'm updating it to match the changes I made.