Commiting simoklhalil & GM initial work