First working commit, still mixed with Cmungall's cv. Watch out for issues