more progress on combat stuff