Putting in temporary fixes

I am running out of time, it's already the 13th. I will now be putting
in temporary fixes all in a single class and hopefully can get the
battle simulator to work.