Added term_move and stuff