Fixed gem structure, added critical TODO