Refactored + added fight features