Getting new stuff from cbreuel to this fork.