Started on CSM code