First working commit, still failry fragile