Fixing everything I broke