Converted to fuburake and ripple2. Closes #4