Added in_battle and made major changes to controllers