move defs bugs
Fixed to running program, untested