Initial Commit of new Battle System with test.
Updated test and bug fixes.