Hopefully won't time out now
Everyhting fixed. So much fixed
merge fixed issues