mostly working commit