Third commit, it seems to work!