commiet
almost working