Adding Corpus functionality, bit by bit.