Transfer updates and use forked version

Closes #1