Some reorg and adding gemrc