first semi working commit