Fleshed out combat a bit