Almost finished working commit