Merge branch 'norris'

Primary change: push 'add_action_to_lists()' before main work in
'check_current_action()'

diff --cc model.cc
Simple merge