Redesign of DragonSlayer to take on better OO principles