Import a slightly modified Bayou version into svn. This is based