first big working commit