Add arguments back to click_fn and move_to_fn
* Had made these changes before but got lost from the PR somehow