Fixed everything wrong from coding too much without testing