More work on InfinityRpg.