Moving to using Subraces - Elves and Dwarves implemented