Almost done, just need computer move integration