Fixed everything! VERY GOOD COMMIT