Lots of work towards new stat system and more sophisticated content