Continued work on battle system

Almost done...