First completely working commit.