Oops just realized I haven't commited any of the main_combat stuff I've been working on