Added preliminary battle surface engine and surface swapping