Finish up moves.js (for now)