First completely working commit!