I remvoed everything because i suck
Fixed merge