Work on battle system, final encounter