Adding even more stuff from the CABAL branch.