Final commit, pretty clean if I may say so :).