Commit it all

Fixed everything should work now