split add_action_to_lists into to two functions and change the order of how things...