Added some preliminary/test fight code