refactor code to allow move and move_line vals change via inherit