Final (hopefully) working commit