Progress on battle, both server and client now