Initial mahdi commits