Dev

Dev and Battle have converged, and since they are currently identical, I'm going to merge them into master and delete Dev. We will go from there