start of infrastructure for new battle mechanics