Fix up some retrofit stuff. Should work to send moves now, untested