Finished adding CM 6/GG maniac stuff