Fixed everything, ready for testing