moves; clearer battle model